diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 8fad433..ef206e5 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -42,6 +42,7 @@ docs/Attribute.md docs/AttributeBufferHeader.md docs/AttributeBufferSize.md docs/Backoff.md +docs/ChangeAssetCredentialsRequest.md docs/Datatype.md docs/Dimension.md docs/DimensionCoordinate.md @@ -301,6 +302,7 @@ src/main/java/io/tiledb/cloud/rest_api/model/Attribute.java src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferHeader.java src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferSize.java src/main/java/io/tiledb/cloud/rest_api/model/Backoff.java +src/main/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequest.java src/main/java/io/tiledb/cloud/rest_api/model/Datatype.java src/main/java/io/tiledb/cloud/rest_api/model/Dimension.java src/main/java/io/tiledb/cloud/rest_api/model/DimensionCoordinate.java @@ -459,216 +461,3 @@ src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarrayRange.java src/main/java/io/tiledb/cloud/rest_api/model/UDFType.java src/main/java/io/tiledb/cloud/rest_api/model/User.java src/main/java/io/tiledb/cloud/rest_api/model/Writer.java -src/test/java/io/tiledb/cloud/rest_api/api/ArrayApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/ArrayTasksApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/AssetsApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/FavoritesApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/FilesApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/GroupsApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/InvitationApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/NotebookApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/NotebooksApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/OrganizationApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/QueryApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/SqlApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/StatsApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphsApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/TasksApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/UdfApiTest.java -src/test/java/io/tiledb/cloud/rest_api/api/UserApiTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AWSAccessCredentialsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ActivityEventTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayActionsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayActivityLogTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayBrowserDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayBrowserSidebarTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayConsolidationRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayEndTimestampDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayFavoriteTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayFavoritesDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayInfoTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayInfoUpdateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayMetadataEntryTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayMetadataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArraySampleTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArraySchemaTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArraySharingTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTaskBrowserSidebarTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTaskDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTaskLogTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTaskStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTaskTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTaskTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ArrayVacuumRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AssetBackingTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AssetInfoTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AssetListResponseTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AssetLocationsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AssetOwnershipLevelTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AssetTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AttributeBufferHeaderTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AttributeBufferSizeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/AttributeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/BackoffTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DatatypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DimensionCoordinateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DimensionTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DimensionTileExtentTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DomainArrayTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DomainCheckResultTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DomainCheckStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DomainTest.java -src/test/java/io/tiledb/cloud/rest_api/model/DomainVerificationStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/EnumerationTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ErrorTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FileCreateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FileCreatedTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FileExportTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FileExportedTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FilePropertyNameTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FileTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FileUploadedTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FilterDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FilterOptionTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FilterPipelineTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FilterTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FilterTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FragmentInfoRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FragmentInfoTest.java -src/test/java/io/tiledb/cloud/rest_api/model/FragmentMetadataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GenericUDFTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GetTiledbStats200ResponseTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupActionsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupBrowserDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupBrowserFilterDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupChangesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupContentActivityAssetTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupContentActivityResponseTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupContentActivityTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupContentsFilterDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupContentsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupCreateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupEntryTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupInfoTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupMemberAssetTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupMemberTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupMemberTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupRegisterTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupSharingRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupSharingTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupTypeMetadataKeyTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/GroupUpdateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationArrayShareEmailTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationFailedRecipientsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationGroupShareEmailTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationOrganizationJoinEmailTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationTest.java -src/test/java/io/tiledb/cloud/rest_api/model/InvitationTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/LastAccessedArrayTest.java -src/test/java/io/tiledb/cloud/rest_api/model/LayoutTest.java -src/test/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaResponseTest.java -src/test/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsResponseTest.java -src/test/java/io/tiledb/cloud/rest_api/model/MLModelFavoriteTest.java -src/test/java/io/tiledb/cloud/rest_api/model/MLModelFavoritesDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/MaxBufferSizesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/MetadataStringifiedEntryTest.java -src/test/java/io/tiledb/cloud/rest_api/model/MetadataStringifiedTest.java -src/test/java/io/tiledb/cloud/rest_api/model/MultiArrayUDFTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NamespaceActionsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NonEmptyDomainTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NotebookCopiedTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NotebookCopyTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NotebookFavoriteTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NotebookFavoritesDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/NotebookStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/OrganizationRolesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/OrganizationTest.java -src/test/java/io/tiledb/cloud/rest_api/model/OrganizationUpdateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/OrganizationUserTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PaginationMetadataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PodStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PricingAggregateUsageTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PricingCurrencyTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PricingIntervalTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PricingTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PricingTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PricingUnitLabelTest.java -src/test/java/io/tiledb/cloud/rest_api/model/PublicShareFilterTest.java -src/test/java/io/tiledb/cloud/rest_api/model/QueryJsonTest.java -src/test/java/io/tiledb/cloud/rest_api/model/QueryRangesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/QueryReaderTest.java -src/test/java/io/tiledb/cloud/rest_api/model/QueryTest.java -src/test/java/io/tiledb/cloud/rest_api/model/QuerystatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/QuerytypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ReadStateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/RegisteredTaskGraphTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ResetUserPasswordRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/ResultFormatTest.java -src/test/java/io/tiledb/cloud/rest_api/model/RetryPolicyTest.java -src/test/java/io/tiledb/cloud/rest_api/model/RetryStrategyTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SQLParametersTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SSODomainConfigResponseTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SSODomainConfigTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SSODomainSetupTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SSOProviderTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SharePaymentRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SingleFragmentInfoTest.java -src/test/java/io/tiledb/cloud/rest_api/model/StorageLocationTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerCurrentTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerStateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SubarrayRangesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SubarrayTest.java -src/test/java/io/tiledb/cloud/rest_api/model/SubscriptionTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGArrayNodeDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGInputNodeDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGQueryRangesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGSQLNodeDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGUDFArgumentTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentResourcesTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGUDFNodeDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TGUDFStorageTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphActionsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphClientNodeStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogRunLocationTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogStatusTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogsDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphNodeMetadataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphNodeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphSharingTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TileDBConfigEntriesInnerTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TileDBConfigTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TokenRequestTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TokenScopeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/TokenTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFActionsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFArrayDetailsTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFCopiedTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFCopyTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFFavoriteTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFFavoritesDataTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFImageTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFImageVersionTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFInfoTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFInfoUpdateTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFLanguageTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFSharingTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFSubarrayRangeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFSubarrayTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UDFTypeTest.java -src/test/java/io/tiledb/cloud/rest_api/model/UserTest.java -src/test/java/io/tiledb/cloud/rest_api/model/WriterTest.java diff --git a/DEVELOP.md b/DEVELOP.md new file mode 100644 index 0000000..09ae291 --- /dev/null +++ b/DEVELOP.md @@ -0,0 +1,25 @@ +# Regenerate client: + +Install desired version of `openapi-generator-cli` ([docs](https://openapi-generator.tech/docs/installation)): +```bash +npm install @openapitools/openapi-generator-cli -g +openapi-generator-cli version-manager set 7.7.0 +openapi-generator generate -i openapi-v1.yaml -g java +``` + +Update local copy of spec from [`TileDB-Server//openapi/v1to3/src/openapi-v1.yaml`](https://github.com/TileDB-Inc/TileDB-Server/blob/main/openapi/v1to3/src/openapi-v1.yaml): +```bash +gh api \ + -H "Accept: application/vnd.github.raw" \ + /repos/TileDB-Inc/TileDB-Server/contents/openapi/v1to3/src/openapi-v1.yaml \ +> openapi-v1.yaml +``` + +Regenerate client ([`regen.sh`](regen.sh)): +```bash +./regen.sh +``` + +This regenerates the client code, `git add`s relevant files, and applies custom code / patches (see [`patch`]). + +[`patch`]: https://github.com/TileDB-Inc/TileDB-Cloud-Java/commit/patch diff --git a/build.gradle b/build.gradle index 8cb838c..beaee7e 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ apply plugin: 'java' apply plugin: 'com.diffplug.spotless' group 'io.tiledb' -version = '0.5.0' +version = '1.0.0-SNAPSHOT' repositories { mavenCentral() diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..0b03ace --- /dev/null +++ b/config.yaml @@ -0,0 +1,4 @@ +additionalProperties: + apiPackage: io.tiledb.cloud.rest_api.api + modelPackage: io.tiledb.cloud.rest_api.model + hideGenerationTimestamp: true diff --git a/docs/ActivityEventType.md b/docs/ActivityEventType.md index d8562a3..2890d0e 100644 --- a/docs/ActivityEventType.md +++ b/docs/ActivityEventType.md @@ -37,5 +37,7 @@ * `READ_ENUMERATIONS` (value: `"read_enumerations"`) +* `NEXTFLOW` (value: `"nextflow"`) + diff --git a/docs/ArrayApi.md b/docs/ArrayApi.md index dad6d50..4949da7 100644 --- a/docs/ArrayApi.md +++ b/docs/ArrayApi.md @@ -4,45 +4,45 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**arrayActivityLog**](ArrayApi.md#arrayActivityLog) | **GET** /arrays/{namespace}/{array}/activity | | +| [**arrayActivityLog**](ArrayApi.md#arrayActivityLog) | **GET** /arrays/{workspace}/{teamspace}/{array}/activity | | | [**arraysBrowserOwnedGet**](ArrayApi.md#arraysBrowserOwnedGet) | **GET** /arrays/browser/owned | | | [**arraysBrowserOwnedSidebarGet**](ArrayApi.md#arraysBrowserOwnedSidebarGet) | **GET** /arrays/browser/owned/sidebar | | | [**arraysBrowserPublicGet**](ArrayApi.md#arraysBrowserPublicGet) | **GET** /arrays/browser/public | | | [**arraysBrowserPublicSidebarGet**](ArrayApi.md#arraysBrowserPublicSidebarGet) | **GET** /arrays/browser/public/sidebar | | | [**arraysBrowserSharedGet**](ArrayApi.md#arraysBrowserSharedGet) | **GET** /arrays/browser/shared | | | [**arraysBrowserSharedSidebarGet**](ArrayApi.md#arraysBrowserSharedSidebarGet) | **GET** /arrays/browser/shared/sidebar | | -| [**arraysNamespaceArrayEndTimestampsGet**](ArrayApi.md#arraysNamespaceArrayEndTimestampsGet) | **GET** /arrays/{namespace}/{array}/end_timestamps | | -| [**consolidateArray**](ArrayApi.md#consolidateArray) | **POST** /arrays/{namespace}/{array}/consolidate | | -| [**createArray**](ArrayApi.md#createArray) | **POST** /arrays/{namespace}/{array} | | -| [**deleteArray**](ArrayApi.md#deleteArray) | **DELETE** /arrays/{namespace}/{array} | | -| [**deregisterArray**](ArrayApi.md#deregisterArray) | **DELETE** /arrays/{namespace}/{array}/deregister | | -| [**fragmentInfo**](ArrayApi.md#fragmentInfo) | **POST** /arrays/{namespace}/{array}/fragment_info | | -| [**getActivityLogById**](ArrayApi.md#getActivityLogById) | **GET** /arrays/{namespace}/{array}/activity/{id} | | +| [**arraysWorkspaceTeamspaceArrayEndTimestampsGet**](ArrayApi.md#arraysWorkspaceTeamspaceArrayEndTimestampsGet) | **GET** /arrays/{workspace}/{teamspace}/{array}/end_timestamps | | +| [**consolidateArray**](ArrayApi.md#consolidateArray) | **POST** /arrays/{workspace}/{teamspace}/{array}/consolidate | | +| [**createArray**](ArrayApi.md#createArray) | **POST** /arrays/{workspace}/{teamspace}/{array} | | +| [**deleteArray**](ArrayApi.md#deleteArray) | **DELETE** /arrays/{workspace}/{teamspace}/{array} | | +| [**deregisterArray**](ArrayApi.md#deregisterArray) | **DELETE** /arrays/{workspace}/{teamspace}/{array}/deregister | | +| [**fragmentInfo**](ArrayApi.md#fragmentInfo) | **POST** /arrays/{workspace}/{teamspace}/{array}/fragment_info | | +| [**getActivityLogById**](ArrayApi.md#getActivityLogById) | **GET** /arrays/{workspace}/{teamspace}/{array}/activity/{id} | | | [**getAllArrayMetadata**](ArrayApi.md#getAllArrayMetadata) | **GET** /arrays | | -| [**getArray**](ArrayApi.md#getArray) | **GET** /arrays/{namespace}/{array} | | -| [**getArrayMaxBufferSizes**](ArrayApi.md#getArrayMaxBufferSizes) | **GET** /arrays/{namespace}/{array}/max_buffer_sizes | | -| [**getArrayMetaDataJson**](ArrayApi.md#getArrayMetaDataJson) | **GET** /arrays/{namespace}/{array}/metadata_json | | -| [**getArrayMetadata**](ArrayApi.md#getArrayMetadata) | **GET** /arrays/{namespace}/{array}/metadata | | -| [**getArrayMetadataCapnp**](ArrayApi.md#getArrayMetadataCapnp) | **GET** /arrays/{namespace}/{array}/array_metadata | | -| [**getArrayNonEmptyDomain**](ArrayApi.md#getArrayNonEmptyDomain) | **GET** /arrays/{namespace}/{array}/non_empty_domain | | -| [**getArrayNonEmptyDomainJson**](ArrayApi.md#getArrayNonEmptyDomainJson) | **GET** /arrays/{namespace}/{array}/non_empty_domain_json | | -| [**getArraySampleData**](ArrayApi.md#getArraySampleData) | **GET** /arrays/{namespace}/{array}/sample | | -| [**getArraySharingPolicies**](ArrayApi.md#getArraySharingPolicies) | **GET** /arrays/{namespace}/{array}/share | | -| [**getArraysInNamespace**](ArrayApi.md#getArraysInNamespace) | **GET** /arrays/{namespace} | | -| [**getFragmentEndTimestamp**](ArrayApi.md#getFragmentEndTimestamp) | **GET** /arrays/{namespace}/{array}/fragment_end_timestamp | | +| [**getArray**](ArrayApi.md#getArray) | **GET** /arrays/{workspace}/{teamspace}/{array} | | +| [**getArrayMaxBufferSizes**](ArrayApi.md#getArrayMaxBufferSizes) | **GET** /arrays/{workspace}/{teamspace}/{array}/max_buffer_sizes | | +| [**getArrayMetaDataJson**](ArrayApi.md#getArrayMetaDataJson) | **GET** /arrays/{workspace}/{teamspace}/{array}/metadata_json | | +| [**getArrayMetadata**](ArrayApi.md#getArrayMetadata) | **GET** /arrays/{workspace}/{teamspace}/{array}/metadata | | +| [**getArrayMetadataCapnp**](ArrayApi.md#getArrayMetadataCapnp) | **GET** /arrays/{workspace}/{teamspace}/{array}/array_metadata | | +| [**getArrayNonEmptyDomain**](ArrayApi.md#getArrayNonEmptyDomain) | **GET** /arrays/{workspace}/{teamspace}/{array}/non_empty_domain | | +| [**getArrayNonEmptyDomainJson**](ArrayApi.md#getArrayNonEmptyDomainJson) | **GET** /arrays/{workspace}/{teamspace}/{array}/non_empty_domain_json | | +| [**getArraySampleData**](ArrayApi.md#getArraySampleData) | **GET** /arrays/{workspace}/{teamspace}/{array}/sample | | +| [**getArraySharingPolicies**](ArrayApi.md#getArraySharingPolicies) | **GET** /arrays/{workspace}/{teamspace}/{array}/share | | +| [**getArraysInNamespace**](ArrayApi.md#getArraysInNamespace) | **GET** /arrays/{workspace}/{teamspace} | | +| [**getFragmentEndTimestamp**](ArrayApi.md#getFragmentEndTimestamp) | **GET** /arrays/{workspace}/{teamspace}/{array}/fragment_end_timestamp | | | [**getLastAccessedArrays**](ArrayApi.md#getLastAccessedArrays) | **GET** /arrays/last_accessed | | -| [**loadArraySchema**](ArrayApi.md#loadArraySchema) | **POST** /arrays/{namespace}/{array}/schema | | -| [**loadEnumerations**](ArrayApi.md#loadEnumerations) | **POST** /arrays/{namespace}/{array}/enumerations | | -| [**registerArray**](ArrayApi.md#registerArray) | **POST** /arrays/{namespace}/{array}/register | | -| [**shareArray**](ArrayApi.md#shareArray) | **PATCH** /arrays/{namespace}/{array}/share | | -| [**updateArrayMetadata**](ArrayApi.md#updateArrayMetadata) | **PATCH** /arrays/{namespace}/{array}/metadata | | -| [**updateArrayMetadataCapnp**](ArrayApi.md#updateArrayMetadataCapnp) | **POST** /arrays/{namespace}/{array}/array_metadata | | -| [**vacuumArray**](ArrayApi.md#vacuumArray) | **POST** /arrays/{namespace}/{array}/vacuum | | +| [**loadArraySchema**](ArrayApi.md#loadArraySchema) | **POST** /arrays/{workspace}/{teamspace}/{array}/schema | | +| [**loadEnumerations**](ArrayApi.md#loadEnumerations) | **POST** /arrays/{workspace}/{teamspace}/{array}/enumerations | | +| [**registerArray**](ArrayApi.md#registerArray) | **POST** /arrays/{workspace}/{teamspace}/{array}/register | | +| [**shareArray**](ArrayApi.md#shareArray) | **PATCH** /arrays/{workspace}/{teamspace}/{array}/share | | +| [**updateArrayMetadata**](ArrayApi.md#updateArrayMetadata) | **PATCH** /arrays/{workspace}/{teamspace}/{array}/metadata | | +| [**updateArrayMetadataCapnp**](ArrayApi.md#updateArrayMetadataCapnp) | **POST** /arrays/{workspace}/{teamspace}/{array}/array_metadata | | +| [**vacuumArray**](ArrayApi.md#vacuumArray) | **POST** /arrays/{workspace}/{teamspace}/{array}/vacuum | | # **arrayActivityLog** -> List<ArrayActivityLog> arrayActivityLog(namespace, array, start, end, eventTypes, taskId, hasTaskId) +> List<ArrayActivityLog> arrayActivityLog(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId) @@ -75,7 +75,8 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer start = 56; // Integer | Start time of window of fetch logs, unix epoch in seconds (default: seven days ago) Integer end = 56; // Integer | End time of window of fetch logs, unix epoch in seconds (default: current utc timestamp) @@ -83,7 +84,7 @@ public class Example { String taskId = "taskId_example"; // String | Array task ID To filter activity to Boolean hasTaskId = true; // Boolean | Excludes activity log results that do not contain an array task UUID try { - List result = apiInstance.arrayActivityLog(namespace, array, start, end, eventTypes, taskId, hasTaskId); + List result = apiInstance.arrayActivityLog(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#arrayActivityLog"); @@ -100,7 +101,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **start** | **Integer**| Start time of window of fetch logs, unix epoch in seconds (default: seven days ago) | [optional] | | **end** | **Integer**| End time of window of fetch logs, unix epoch in seconds (default: current utc timestamp) | [optional] | @@ -666,9 +668,9 @@ public class Example { | **502** | Bad Gateway | - | | **0** | error response | - | - -# **arraysNamespaceArrayEndTimestampsGet** -> ArrayEndTimestampData arraysNamespaceArrayEndTimestampsGet(namespace, array, page, perPage) + +# **arraysWorkspaceTeamspaceArrayEndTimestampsGet** +> ArrayEndTimestampData arraysWorkspaceTeamspaceArrayEndTimestampsGet(workspace, teamspace, array, page, perPage) @@ -701,15 +703,16 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer page = 56; // Integer | pagination offset Integer perPage = 56; // Integer | pagination limit try { - ArrayEndTimestampData result = apiInstance.arraysNamespaceArrayEndTimestampsGet(namespace, array, page, perPage); + ArrayEndTimestampData result = apiInstance.arraysWorkspaceTeamspaceArrayEndTimestampsGet(workspace, teamspace, array, page, perPage); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#arraysNamespaceArrayEndTimestampsGet"); + System.err.println("Exception when calling ArrayApi#arraysWorkspaceTeamspaceArrayEndTimestampsGet"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -723,7 +726,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **page** | **Integer**| pagination offset | [optional] | | **perPage** | **Integer**| pagination limit | [optional] | @@ -750,7 +754,7 @@ public class Example { # **consolidateArray** -> consolidateArray(namespace, array, consolidateRequest) +> consolidateArray(workspace, teamspace, array, consolidateRequest) @@ -783,11 +787,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded ArrayConsolidationRequest consolidateRequest = new ArrayConsolidationRequest(); // ArrayConsolidationRequest | Consolidate Request try { - apiInstance.consolidateArray(namespace, array, consolidateRequest); + apiInstance.consolidateArray(workspace, teamspace, array, consolidateRequest); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#consolidateArray"); System.err.println("Status code: " + e.getCode()); @@ -803,7 +808,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **consolidateRequest** | [**ArrayConsolidationRequest**](ArrayConsolidationRequest.md)| Consolidate Request | | @@ -829,7 +835,7 @@ null (empty response body) # **createArray** -> createArray(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) +> createArray(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) @@ -862,13 +868,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime ArraySchema arraySchema = new ArraySchema(); // ArraySchema | ArraySchema being created String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = "X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME_example"; // String | Optional registered access credentials to use for creation try { - apiInstance.createArray(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); + apiInstance.createArray(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#createArray"); System.err.println("Status code: " + e.getCode()); @@ -884,7 +891,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | | **arraySchema** | [**ArraySchema**](ArraySchema.md)| ArraySchema being created | | @@ -912,7 +920,7 @@ null (empty response body) # **deleteArray** -> deleteArray(namespace, array, contentType) +> deleteArray(workspace, teamspace, array, contentType) @@ -945,11 +953,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime try { - apiInstance.deleteArray(namespace, array, contentType); + apiInstance.deleteArray(workspace, teamspace, array, contentType); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#deleteArray"); System.err.println("Status code: " + e.getCode()); @@ -965,7 +974,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | @@ -991,7 +1001,7 @@ null (empty response body) # **deregisterArray** -> deregisterArray(namespace, array) +> deregisterArray(workspace, teamspace, array) @@ -1024,10 +1034,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded try { - apiInstance.deregisterArray(namespace, array); + apiInstance.deregisterArray(workspace, teamspace, array); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#deregisterArray"); System.err.println("Status code: " + e.getCode()); @@ -1043,7 +1054,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | ### Return type @@ -1068,7 +1080,7 @@ null (empty response body) # **fragmentInfo** -> FragmentInfo fragmentInfo(namespace, array, contentType, fragmentInfoRequest) +> FragmentInfo fragmentInfo(workspace, teamspace, array, contentType, fragmentInfoRequest) @@ -1101,12 +1113,13 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime FragmentInfoRequest fragmentInfoRequest = new FragmentInfoRequest(); // FragmentInfoRequest | ArraySchema being created try { - FragmentInfo result = apiInstance.fragmentInfo(namespace, array, contentType, fragmentInfoRequest); + FragmentInfo result = apiInstance.fragmentInfo(workspace, teamspace, array, contentType, fragmentInfoRequest); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#fragmentInfo"); @@ -1123,7 +1136,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | | **fragmentInfoRequest** | [**FragmentInfoRequest**](FragmentInfoRequest.md)| ArraySchema being created | | @@ -1149,7 +1163,7 @@ public class Example { # **getActivityLogById** -> ArrayActivityLog getActivityLogById(namespace, array, id) +> ArrayActivityLog getActivityLogById(workspace, teamspace, array, id) @@ -1182,11 +1196,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String id = "id_example"; // String | ID of the activity try { - ArrayActivityLog result = apiInstance.getActivityLogById(namespace, array, id); + ArrayActivityLog result = apiInstance.getActivityLogById(workspace, teamspace, array, id); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getActivityLogById"); @@ -1203,7 +1218,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **id** | **String**| ID of the activity | | @@ -1305,7 +1321,7 @@ public class Example { # **getArray** -> ArraySchema getArray(namespace, array, contentType) +> ArraySchema getArray(workspace, teamspace, array, contentType) @@ -1338,11 +1354,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime try { - ArraySchema result = apiInstance.getArray(namespace, array, contentType); + ArraySchema result = apiInstance.getArray(workspace, teamspace, array, contentType); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArray"); @@ -1359,7 +1376,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | @@ -1385,7 +1403,7 @@ public class Example { # **getArrayMaxBufferSizes** -> MaxBufferSizes getArrayMaxBufferSizes(namespace, array, subarray, contentType, xPayer) +> MaxBufferSizes getArrayMaxBufferSizes(workspace, teamspace, array, subarray, contentType, xPayer) @@ -1418,13 +1436,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String subarray = "subarray_example"; // String | CSV string of subarray to get max buffer sizes for String contentType = "application/json"; // String | Content Type of input and return mime String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request try { - MaxBufferSizes result = apiInstance.getArrayMaxBufferSizes(namespace, array, subarray, contentType, xPayer); + MaxBufferSizes result = apiInstance.getArrayMaxBufferSizes(workspace, teamspace, array, subarray, contentType, xPayer); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArrayMaxBufferSizes"); @@ -1441,7 +1460,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **subarray** | **String**| CSV string of subarray to get max buffer sizes for | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | @@ -1469,7 +1489,7 @@ public class Example { # **getArrayMetaDataJson** -> Map<String, Object> getArrayMetaDataJson(namespace, array, length, endTimestamp) +> Map<String, Object> getArrayMetaDataJson(workspace, teamspace, array, length, endTimestamp) @@ -1502,12 +1522,13 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer length = 56; // Integer | (optional) limit character length of returned values Integer endTimestamp = 56; // Integer | Milliseconds since Unix epoch, metadata will use open_at functionality to open array at the specific timestamp try { - Map result = apiInstance.getArrayMetaDataJson(namespace, array, length, endTimestamp); + Map result = apiInstance.getArrayMetaDataJson(workspace, teamspace, array, length, endTimestamp); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArrayMetaDataJson"); @@ -1524,7 +1545,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **length** | **Integer**| (optional) limit character length of returned values | [optional] | | **endTimestamp** | **Integer**| Milliseconds since Unix epoch, metadata will use open_at functionality to open array at the specific timestamp | [optional] | @@ -1551,7 +1573,7 @@ public class Example { # **getArrayMetadata** -> ArrayInfo getArrayMetadata(namespace, array) +> ArrayInfo getArrayMetadata(workspace, teamspace, array) @@ -1584,10 +1606,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded try { - ArrayInfo result = apiInstance.getArrayMetadata(namespace, array); + ArrayInfo result = apiInstance.getArrayMetadata(workspace, teamspace, array); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArrayMetadata"); @@ -1604,7 +1627,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | ### Return type @@ -1629,7 +1653,7 @@ public class Example { # **getArrayMetadataCapnp** -> ArrayMetadata getArrayMetadataCapnp(namespace, array) +> ArrayMetadata getArrayMetadataCapnp(workspace, teamspace, array) @@ -1662,10 +1686,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded try { - ArrayMetadata result = apiInstance.getArrayMetadataCapnp(namespace, array); + ArrayMetadata result = apiInstance.getArrayMetadataCapnp(workspace, teamspace, array); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArrayMetadataCapnp"); @@ -1682,7 +1707,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | ### Return type @@ -1707,7 +1733,7 @@ public class Example { # **getArrayNonEmptyDomain** -> NonEmptyDomain getArrayNonEmptyDomain(namespace, array, contentType, xPayer) +> NonEmptyDomain getArrayNonEmptyDomain(workspace, teamspace, array, contentType, xPayer) @@ -1740,12 +1766,13 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request try { - NonEmptyDomain result = apiInstance.getArrayNonEmptyDomain(namespace, array, contentType, xPayer); + NonEmptyDomain result = apiInstance.getArrayNonEmptyDomain(workspace, teamspace, array, contentType, xPayer); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArrayNonEmptyDomain"); @@ -1762,7 +1789,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | | **xPayer** | **String**| Name of organization or user who should be charged for this request | [optional] | @@ -1789,7 +1817,7 @@ public class Example { # **getArrayNonEmptyDomainJson** -> Map<String, Object> getArrayNonEmptyDomainJson(namespace, array) +> Map<String, Object> getArrayNonEmptyDomainJson(workspace, teamspace, array) @@ -1822,10 +1850,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded try { - Map result = apiInstance.getArrayNonEmptyDomainJson(namespace, array); + Map result = apiInstance.getArrayNonEmptyDomainJson(workspace, teamspace, array); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArrayNonEmptyDomainJson"); @@ -1842,7 +1871,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | ### Return type @@ -1867,7 +1897,7 @@ public class Example { # **getArraySampleData** -> ArraySample getArraySampleData(namespace, array, samples) +> ArraySample getArraySampleData(workspace, teamspace, array, samples) @@ -1900,11 +1930,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded BigDecimal samples = new BigDecimal("5.0"); // BigDecimal | Number of sample results to return try { - ArraySample result = apiInstance.getArraySampleData(namespace, array, samples); + ArraySample result = apiInstance.getArraySampleData(workspace, teamspace, array, samples); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArraySampleData"); @@ -1921,7 +1952,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **samples** | **BigDecimal**| Number of sample results to return | [optional] [default to 5.0] | @@ -1947,7 +1979,7 @@ public class Example { # **getArraySharingPolicies** -> List<ArraySharing> getArraySharingPolicies(namespace, array) +> List<ArraySharing> getArraySharingPolicies(workspace, teamspace, array) @@ -1980,10 +2012,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded try { - List result = apiInstance.getArraySharingPolicies(namespace, array); + List result = apiInstance.getArraySharingPolicies(workspace, teamspace, array); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArraySharingPolicies"); @@ -2000,7 +2033,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | ### Return type @@ -2026,7 +2060,7 @@ public class Example { # **getArraysInNamespace** -> List<ArrayInfo> getArraysInNamespace(namespace, withMetadata) +> List<ArrayInfo> getArraysInNamespace(workspace, teamspace, withMetadata) @@ -2059,10 +2093,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to Boolean withMetadata = true; // Boolean | include the metadata of the arrays try { - List result = apiInstance.getArraysInNamespace(namespace, withMetadata); + List result = apiInstance.getArraysInNamespace(workspace, teamspace, withMetadata); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getArraysInNamespace"); @@ -2079,7 +2114,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **withMetadata** | **Boolean**| include the metadata of the arrays | [optional] | ### Return type @@ -2104,7 +2140,7 @@ public class Example { # **getFragmentEndTimestamp** -> Integer getFragmentEndTimestamp(namespace, array, endTimestamp) +> Integer getFragmentEndTimestamp(workspace, teamspace, array, endTimestamp) @@ -2137,11 +2173,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer endTimestamp = 56; // Integer | Milliseconds since Unix epoch try { - Integer result = apiInstance.getFragmentEndTimestamp(namespace, array, endTimestamp); + Integer result = apiInstance.getFragmentEndTimestamp(workspace, teamspace, array, endTimestamp); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#getFragmentEndTimestamp"); @@ -2158,7 +2195,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **endTimestamp** | **Integer**| Milliseconds since Unix epoch | [optional] | @@ -2254,7 +2292,7 @@ This endpoint does not need any parameter. # **loadArraySchema** -> LoadArraySchemaResponse loadArraySchema(namespace, array, loadArraySchemaRequest) +> LoadArraySchemaResponse loadArraySchema(workspace, teamspace, array, loadArraySchemaRequest) @@ -2287,11 +2325,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded LoadArraySchemaRequest loadArraySchemaRequest = new LoadArraySchemaRequest(); // LoadArraySchemaRequest | Load Array Schema Request try { - LoadArraySchemaResponse result = apiInstance.loadArraySchema(namespace, array, loadArraySchemaRequest); + LoadArraySchemaResponse result = apiInstance.loadArraySchema(workspace, teamspace, array, loadArraySchemaRequest); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#loadArraySchema"); @@ -2308,7 +2347,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **loadArraySchemaRequest** | [**LoadArraySchemaRequest**](LoadArraySchemaRequest.md)| Load Array Schema Request | | @@ -2335,7 +2375,7 @@ public class Example { # **loadEnumerations** -> LoadEnumerationsResponse loadEnumerations(namespace, array, loadEnumerationsRequest) +> LoadEnumerationsResponse loadEnumerations(workspace, teamspace, array, loadEnumerationsRequest) @@ -2368,11 +2408,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded LoadEnumerationsRequest loadEnumerationsRequest = new LoadEnumerationsRequest(); // LoadEnumerationsRequest | Load Enumerations Request try { - LoadEnumerationsResponse result = apiInstance.loadEnumerations(namespace, array, loadEnumerationsRequest); + LoadEnumerationsResponse result = apiInstance.loadEnumerations(workspace, teamspace, array, loadEnumerationsRequest); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#loadEnumerations"); @@ -2389,7 +2430,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **loadEnumerationsRequest** | [**LoadEnumerationsRequest**](LoadEnumerationsRequest.md)| Load Enumerations Request | | @@ -2416,7 +2458,7 @@ public class Example { # **registerArray** -> ArrayInfo registerArray(namespace, array, arrayMetadata) +> ArrayInfo registerArray(workspace, teamspace, array, arrayMetadata) @@ -2449,11 +2491,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) - String array = "array_example"; // String | name/uri of array that is url-encoded + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to + String array = "array_example"; // String | asset id or path of array that is url-encoded ArrayInfoUpdate arrayMetadata = new ArrayInfoUpdate(); // ArrayInfoUpdate | metadata associated with array try { - ArrayInfo result = apiInstance.registerArray(namespace, array, arrayMetadata); + ArrayInfo result = apiInstance.registerArray(workspace, teamspace, array, arrayMetadata); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#registerArray"); @@ -2470,8 +2513,9 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | -| **array** | **String**| name/uri of array that is url-encoded | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | +| **array** | **String**| asset id or path of array that is url-encoded | | | **arrayMetadata** | [**ArrayInfoUpdate**](ArrayInfoUpdate.md)| metadata associated with array | | ### Return type @@ -2496,7 +2540,7 @@ public class Example { # **shareArray** -> shareArray(namespace, array, arraySharing) +> shareArray(workspace, teamspace, array, arraySharing) @@ -2529,11 +2573,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded ArraySharing arraySharing = new ArraySharing(); // ArraySharing | Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the array will not be shared with the namespace at all. try { - apiInstance.shareArray(namespace, array, arraySharing); + apiInstance.shareArray(workspace, teamspace, array, arraySharing); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#shareArray"); System.err.println("Status code: " + e.getCode()); @@ -2549,7 +2594,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **arraySharing** | [**ArraySharing**](ArraySharing.md)| Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the array will not be shared with the namespace at all. | | @@ -2576,7 +2622,7 @@ null (empty response body) # **updateArrayMetadata** -> updateArrayMetadata(namespace, array, arrayMetadata) +> updateArrayMetadata(workspace, teamspace, array, arrayMetadata) @@ -2609,11 +2655,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded ArrayInfoUpdate arrayMetadata = new ArrayInfoUpdate(); // ArrayInfoUpdate | array metadata to update try { - apiInstance.updateArrayMetadata(namespace, array, arrayMetadata); + apiInstance.updateArrayMetadata(workspace, teamspace, array, arrayMetadata); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#updateArrayMetadata"); System.err.println("Status code: " + e.getCode()); @@ -2629,7 +2676,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **arrayMetadata** | [**ArrayInfoUpdate**](ArrayInfoUpdate.md)| array metadata to update | | @@ -2655,7 +2703,7 @@ null (empty response body) # **updateArrayMetadataCapnp** -> updateArrayMetadataCapnp(namespace, array, arrayMetadataEntries) +> updateArrayMetadataCapnp(workspace, teamspace, array, arrayMetadataEntries) @@ -2688,11 +2736,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded ArrayMetadata arrayMetadataEntries = new ArrayMetadata(); // ArrayMetadata | List of metadata entries try { - apiInstance.updateArrayMetadataCapnp(namespace, array, arrayMetadataEntries); + apiInstance.updateArrayMetadataCapnp(workspace, teamspace, array, arrayMetadataEntries); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#updateArrayMetadataCapnp"); System.err.println("Status code: " + e.getCode()); @@ -2708,7 +2757,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **arrayMetadataEntries** | [**ArrayMetadata**](ArrayMetadata.md)| List of metadata entries | | @@ -2734,7 +2784,7 @@ null (empty response body) # **vacuumArray** -> vacuumArray(namespace, array, vaccumRequest) +> vacuumArray(workspace, teamspace, array, vaccumRequest) @@ -2767,11 +2817,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); ArrayApi apiInstance = new ArrayApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded ArrayVacuumRequest vaccumRequest = new ArrayVacuumRequest(); // ArrayVacuumRequest | Vaccum Request try { - apiInstance.vacuumArray(namespace, array, vaccumRequest); + apiInstance.vacuumArray(workspace, teamspace, array, vaccumRequest); } catch (ApiException e) { System.err.println("Exception when calling ArrayApi#vacuumArray"); System.err.println("Status code: " + e.getCode()); @@ -2787,7 +2838,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **vaccumRequest** | [**ArrayVacuumRequest**](ArrayVacuumRequest.md)| Vaccum Request | | diff --git a/docs/ArrayInfo.md b/docs/ArrayInfo.md index 9fae9b7..56c4150 100644 --- a/docs/ArrayInfo.md +++ b/docs/ArrayInfo.md @@ -9,6 +9,7 @@ metadata of an array | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**id** | **String** | unique ID of registered array | [optional] | +|**assetId** | **String** | The asset id of the created array | [optional] | |**fileType** | **FileType** | | [optional] | |**fileProperties** | **Map<String, String>** | map of file properties created for this array | [optional] | |**uri** | **String** | uri of array | [optional] | diff --git a/docs/AssetsApi.md b/docs/AssetsApi.md index f7ddd98..d89b1b8 100644 --- a/docs/AssetsApi.md +++ b/docs/AssetsApi.md @@ -4,13 +4,93 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**listAssets**](AssetsApi.md#listAssets) | **GET** /assets/{namespace} | | +| [**changeAssetCredentials**](AssetsApi.md#changeAssetCredentials) | **POST** /assets/{workspace}/{teamspace}/change_credentials | | +| [**listAssets**](AssetsApi.md#listAssets) | **GET** /assets/{workspace}/{teamspace} | | | [**listPublicAssets**](AssetsApi.md#listPublicAssets) | **GET** /public_assets | | + +# **changeAssetCredentials** +> changeAssetCredentials(workspace, teamspace, changeCredentialsRequest) + + + +Changes the access credentials to the given assets + +### Example +```java +// Import classes: +import io.tiledb.cloud.rest_api.ApiClient; +import io.tiledb.cloud.rest_api.ApiException; +import io.tiledb.cloud.rest_api.Configuration; +import io.tiledb.cloud.rest_api.auth.*; +import io.tiledb.cloud.rest_api.models.*; +import io.tiledb.cloud.rest_api.api.AssetsApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("/v1"); + + // Configure HTTP basic authorization: BasicAuth + HttpBasicAuth BasicAuth = (HttpBasicAuth) defaultClient.getAuthentication("BasicAuth"); + BasicAuth.setUsername("YOUR USERNAME"); + BasicAuth.setPassword("YOUR PASSWORD"); + + // Configure API key authorization: ApiKeyAuth + ApiKeyAuth ApiKeyAuth = (ApiKeyAuth) defaultClient.getAuthentication("ApiKeyAuth"); + ApiKeyAuth.setApiKey("YOUR API KEY"); + // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null) + //ApiKeyAuth.setApiKeyPrefix("Token"); + + AssetsApi apiInstance = new AssetsApi(defaultClient); + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to + ChangeAssetCredentialsRequest changeCredentialsRequest = new ChangeAssetCredentialsRequest(); // ChangeAssetCredentialsRequest | aws access credentials to store for a namespace + try { + apiInstance.changeAssetCredentials(workspace, teamspace, changeCredentialsRequest); + } catch (ApiException e) { + System.err.println("Exception when calling AssetsApi#changeAssetCredentials"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | +| **changeCredentialsRequest** | [**ChangeAssetCredentialsRequest**](ChangeAssetCredentialsRequest.md)| aws access credentials to store for a namespace | | + +### Return type + +null (empty response body) + +### Authorization + +[BasicAuth](../README.md#BasicAuth), [ApiKeyAuth](../README.md#ApiKeyAuth) + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **204** | Credentials changed successfully | - | +| **502** | Bad Gateway | - | +| **0** | error response | - | + # **listAssets** -> AssetListResponse listAssets(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand) +> AssetListResponse listAssets(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand) @@ -43,7 +123,8 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); AssetsApi apiInstance = new AssetsApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String assetType = "assetType_example"; // String | asset_type to filter to String ownershipLevel = "ownershipLevel_example"; // String | ownership_level to filter to (owned, shared) String depth = "depth_example"; // String | depth of assets to be returned @@ -53,7 +134,7 @@ public class Example { String orderBy = "orderBy_example"; // String | order by a specific property, defaults to `created_at desc` supported values are created_at, name, asset_type can also include the order type (asc or desc) separated by space i.e. `name asc` `name desc` etc. String expand = "expand_example"; // String | expansion option for the AssetInfo object to be added to the response try { - AssetListResponse result = apiInstance.listAssets(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand); + AssetListResponse result = apiInstance.listAssets(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling AssetsApi#listAssets"); @@ -70,7 +151,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **assetType** | **String**| asset_type to filter to | [optional] | | **ownershipLevel** | **String**| ownership_level to filter to (owned, shared) | [optional] | | **depth** | **String**| depth of assets to be returned | [optional] | diff --git a/docs/ChangeAssetCredentialsRequest.md b/docs/ChangeAssetCredentialsRequest.md new file mode 100644 index 0000000..a277a74 --- /dev/null +++ b/docs/ChangeAssetCredentialsRequest.md @@ -0,0 +1,15 @@ + + +# ChangeAssetCredentialsRequest + +Request body to change the credentials of the given assets + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**accessCredentials** | **String** | The name or uuid of the access credentials | | +|**assetUuids** | **List<String>** | The list of asset uuids to have their credentials changed | | + + + diff --git a/docs/FavoritesApi.md b/docs/FavoritesApi.md index 95fbd64..20ee437 100644 --- a/docs/FavoritesApi.md +++ b/docs/FavoritesApi.md @@ -4,18 +4,18 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**addArrayFavorite**](FavoritesApi.md#addArrayFavorite) | **POST** /arrays/favorites/{namespace}/{name} | | -| [**addMLModelFavorite**](FavoritesApi.md#addMLModelFavorite) | **POST** /ml_models/favorites/{namespace}/{name} | | -| [**addNotebookFavorite**](FavoritesApi.md#addNotebookFavorite) | **POST** /notebooks/favorites/{namespace}/{name} | | -| [**addUDFFavorite**](FavoritesApi.md#addUDFFavorite) | **POST** /udfs/favorites/{namespace}/{name} | | -| [**deleteArrayFavorite**](FavoritesApi.md#deleteArrayFavorite) | **DELETE** /arrays/favorites/{namespace}/{name} | | -| [**deleteMLModelFavorite**](FavoritesApi.md#deleteMLModelFavorite) | **DELETE** /ml_models/favorites/{namespace}/{name} | | -| [**deleteNotebookFavorite**](FavoritesApi.md#deleteNotebookFavorite) | **DELETE** /notebooks/favorites/{namespace}/{name} | | -| [**deleteUDFFavorite**](FavoritesApi.md#deleteUDFFavorite) | **DELETE** /udfs/favorites/{namespace}/{name} | | -| [**getArrayFavorite**](FavoritesApi.md#getArrayFavorite) | **GET** /arrays/favorites/{namespace}/{name} | | -| [**getMLModelFavorite**](FavoritesApi.md#getMLModelFavorite) | **GET** /ml_models/favorites/{namespace}/{name} | | -| [**getNotebookFavorite**](FavoritesApi.md#getNotebookFavorite) | **GET** /notebooks/favorites/{namespace}/{name} | | -| [**getUDFFavorite**](FavoritesApi.md#getUDFFavorite) | **GET** /udfs/favorites/{namespace}/{name} | | +| [**addArrayFavorite**](FavoritesApi.md#addArrayFavorite) | **POST** /arrays/favorites/{workspace}/{teamspace}/{name} | | +| [**addMLModelFavorite**](FavoritesApi.md#addMLModelFavorite) | **POST** /ml_models/favorites/{workspace}/{teamspace}/{name} | | +| [**addNotebookFavorite**](FavoritesApi.md#addNotebookFavorite) | **POST** /notebooks/favorites/{workspace}/{teamspace}/{name} | | +| [**addUDFFavorite**](FavoritesApi.md#addUDFFavorite) | **POST** /udfs/favorites/{workspace}/{name} | | +| [**deleteArrayFavorite**](FavoritesApi.md#deleteArrayFavorite) | **DELETE** /arrays/favorites/{workspace}/{teamspace}/{name} | | +| [**deleteMLModelFavorite**](FavoritesApi.md#deleteMLModelFavorite) | **DELETE** /ml_models/favorites/{workspace}/{teamspace}/{name} | | +| [**deleteNotebookFavorite**](FavoritesApi.md#deleteNotebookFavorite) | **DELETE** /notebooks/favorites/{workspace}/{teamspace}/{name} | | +| [**deleteUDFFavorite**](FavoritesApi.md#deleteUDFFavorite) | **DELETE** /udfs/favorites/{workspace}/{name} | | +| [**getArrayFavorite**](FavoritesApi.md#getArrayFavorite) | **GET** /arrays/favorites/{workspace}/{teamspace}/{name} | | +| [**getMLModelFavorite**](FavoritesApi.md#getMLModelFavorite) | **GET** /ml_models/favorites/{workspace}/{teamspace}/{name} | | +| [**getNotebookFavorite**](FavoritesApi.md#getNotebookFavorite) | **GET** /notebooks/favorites/{workspace}/{teamspace}/{name} | | +| [**getUDFFavorite**](FavoritesApi.md#getUDFFavorite) | **GET** /udfs/favorites/{workspace}/{name} | | | [**listArrayFavorites**](FavoritesApi.md#listArrayFavorites) | **GET** /arrays/favorites | | | [**listArrayFavoritesUUIDs**](FavoritesApi.md#listArrayFavoritesUUIDs) | **GET** /arrays/favorites/uuids | | | [**listMLModelFavorites**](FavoritesApi.md#listMLModelFavorites) | **GET** /ml_models/favorites | | @@ -28,7 +28,7 @@ All URIs are relative to */v1* # **addArrayFavorite** -> addArrayFavorite(namespace, name) +> addArrayFavorite(workspace, teamspace, name) @@ -61,10 +61,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the array + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the array try { - apiInstance.addArrayFavorite(namespace, name); + apiInstance.addArrayFavorite(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#addArrayFavorite"); System.err.println("Status code: " + e.getCode()); @@ -80,7 +81,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the array | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the array | | ### Return type @@ -105,7 +107,7 @@ null (empty response body) # **addMLModelFavorite** -> addMLModelFavorite(namespace, name) +> addMLModelFavorite(workspace, teamspace, name) @@ -138,10 +140,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the ML model + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the ML model try { - apiInstance.addMLModelFavorite(namespace, name); + apiInstance.addMLModelFavorite(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#addMLModelFavorite"); System.err.println("Status code: " + e.getCode()); @@ -157,7 +160,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the ML model | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the ML model | | ### Return type @@ -182,7 +186,7 @@ null (empty response body) # **addNotebookFavorite** -> addNotebookFavorite(namespace, name) +> addNotebookFavorite(workspace, teamspace, name) @@ -215,10 +219,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the notebook + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the notebook try { - apiInstance.addNotebookFavorite(namespace, name); + apiInstance.addNotebookFavorite(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#addNotebookFavorite"); System.err.println("Status code: " + e.getCode()); @@ -234,7 +239,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the notebook | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the notebook | | ### Return type @@ -259,7 +265,7 @@ null (empty response body) # **addUDFFavorite** -> addUDFFavorite(namespace, name) +> addUDFFavorite(workspace, name) @@ -292,10 +298,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the UDF + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the UDF try { - apiInstance.addUDFFavorite(namespace, name); + apiInstance.addUDFFavorite(workspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#addUDFFavorite"); System.err.println("Status code: " + e.getCode()); @@ -311,7 +317,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the UDF | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the UDF | | ### Return type @@ -336,7 +342,7 @@ null (empty response body) # **deleteArrayFavorite** -> deleteArrayFavorite(namespace, name) +> deleteArrayFavorite(workspace, teamspace, name) @@ -369,10 +375,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the array + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the array try { - apiInstance.deleteArrayFavorite(namespace, name); + apiInstance.deleteArrayFavorite(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#deleteArrayFavorite"); System.err.println("Status code: " + e.getCode()); @@ -388,7 +395,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the array | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the array | | ### Return type @@ -413,7 +421,7 @@ null (empty response body) # **deleteMLModelFavorite** -> deleteMLModelFavorite(namespace, name) +> deleteMLModelFavorite(workspace, teamspace, name) @@ -446,10 +454,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the ML model + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the ML model try { - apiInstance.deleteMLModelFavorite(namespace, name); + apiInstance.deleteMLModelFavorite(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#deleteMLModelFavorite"); System.err.println("Status code: " + e.getCode()); @@ -465,7 +474,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the ML model | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the ML model | | ### Return type @@ -490,7 +500,7 @@ null (empty response body) # **deleteNotebookFavorite** -> deleteNotebookFavorite(namespace, name) +> deleteNotebookFavorite(workspace, teamspace, name) @@ -523,10 +533,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the notebook + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the notebook try { - apiInstance.deleteNotebookFavorite(namespace, name); + apiInstance.deleteNotebookFavorite(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#deleteNotebookFavorite"); System.err.println("Status code: " + e.getCode()); @@ -542,7 +553,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the notebook | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the notebook | | ### Return type @@ -567,7 +579,7 @@ null (empty response body) # **deleteUDFFavorite** -> deleteUDFFavorite(namespace, name) +> deleteUDFFavorite(workspace, name) @@ -600,10 +612,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the UDF + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the UDF try { - apiInstance.deleteUDFFavorite(namespace, name); + apiInstance.deleteUDFFavorite(workspace, name); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#deleteUDFFavorite"); System.err.println("Status code: " + e.getCode()); @@ -619,7 +631,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the UDF | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the UDF | | ### Return type @@ -644,7 +656,7 @@ null (empty response body) # **getArrayFavorite** -> ArrayFavorite getArrayFavorite(namespace, name) +> ArrayFavorite getArrayFavorite(workspace, teamspace, name) @@ -677,10 +689,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the array + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the array try { - ArrayFavorite result = apiInstance.getArrayFavorite(namespace, name); + ArrayFavorite result = apiInstance.getArrayFavorite(workspace, teamspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#getArrayFavorite"); @@ -697,7 +710,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the array | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the array | | ### Return type @@ -722,7 +736,7 @@ public class Example { # **getMLModelFavorite** -> MLModelFavorite getMLModelFavorite(namespace, name) +> MLModelFavorite getMLModelFavorite(workspace, teamspace, name) @@ -755,10 +769,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the ML model + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the ML model try { - MLModelFavorite result = apiInstance.getMLModelFavorite(namespace, name); + MLModelFavorite result = apiInstance.getMLModelFavorite(workspace, teamspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#getMLModelFavorite"); @@ -775,7 +790,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the ML model | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the ML model | | ### Return type @@ -800,7 +816,7 @@ public class Example { # **getNotebookFavorite** -> NotebookFavorite getNotebookFavorite(namespace, name) +> NotebookFavorite getNotebookFavorite(workspace, teamspace, name) @@ -833,10 +849,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the notebook + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String name = "name_example"; // String | The name of the notebook try { - NotebookFavorite result = apiInstance.getNotebookFavorite(namespace, name); + NotebookFavorite result = apiInstance.getNotebookFavorite(workspace, teamspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#getNotebookFavorite"); @@ -853,7 +870,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the notebook | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **name** | **String**| The name of the notebook | | ### Return type @@ -878,7 +896,7 @@ public class Example { # **getUDFFavorite** -> UDFFavorite getUDFFavorite(namespace, name) +> UDFFavorite getUDFFavorite(workspace, name) @@ -911,10 +929,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FavoritesApi apiInstance = new FavoritesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the UDF + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the UDF try { - UDFFavorite result = apiInstance.getUDFFavorite(namespace, name); + UDFFavorite result = apiInstance.getUDFFavorite(workspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FavoritesApi#getUDFFavorite"); @@ -931,7 +949,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the UDF | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the UDF | | ### Return type diff --git a/docs/FileUploaded.md b/docs/FileUploaded.md index 43308c9..3993003 100644 --- a/docs/FileUploaded.md +++ b/docs/FileUploaded.md @@ -10,6 +10,7 @@ Uploaded file name and information |------------ | ------------- | ------------- | -------------| |**outputUri** | **String** | output location of the TileDB File | [optional] | |**fileName** | **String** | name of the file uploaded | [optional] | +|**assetId** | **String** | The asset id of the created Group | | |**id** | **String** | unique ID of the uploaded file | | diff --git a/docs/FilesApi.md b/docs/FilesApi.md index c2e9765..1809bdb 100644 --- a/docs/FilesApi.md +++ b/docs/FilesApi.md @@ -4,14 +4,14 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**handleCreateFile**](FilesApi.md#handleCreateFile) | **POST** /files/{namespace} | | -| [**handleExportFile**](FilesApi.md#handleExportFile) | **POST** /files/{namespace}/{file}/export | | -| [**handleUploadFile**](FilesApi.md#handleUploadFile) | **POST** /files/{namespace}/upload | | +| [**handleCreateFile**](FilesApi.md#handleCreateFile) | **POST** /files/{workspace}/{teamspace} | | +| [**handleExportFile**](FilesApi.md#handleExportFile) | **POST** /files/{workspace}/{teamspace}/{file}/export | | +| [**handleUploadFile**](FilesApi.md#handleUploadFile) | **POST** /files/{workspace}/{teamspace}/upload | | # **handleCreateFile** -> FileCreated handleCreateFile(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) +> FileCreated handleCreateFile(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) @@ -44,11 +44,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FilesApi apiInstance = new FilesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the file + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to FileCreate fileCreate = new FileCreate(); // FileCreate | Input/Output information to create a new TileDB file String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = "X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME_example"; // String | Optional registered access credentials to use for creation try { - FileCreated result = apiInstance.handleCreateFile(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); + FileCreated result = apiInstance.handleCreateFile(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FilesApi#handleCreateFile"); @@ -65,7 +66,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the file | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **fileCreate** | [**FileCreate**](FileCreate.md)| Input/Output information to create a new TileDB file | | | **X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME** | **String**| Optional registered access credentials to use for creation | [optional] | @@ -91,7 +93,7 @@ public class Example { # **handleExportFile** -> FileExported handleExportFile(namespace, _file, fileExport) +> FileExported handleExportFile(workspace, teamspace, _file, fileExport) @@ -124,11 +126,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FilesApi apiInstance = new FilesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the file + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String _file = "_file_example"; // String | The file identifier FileExport fileExport = new FileExport(); // FileExport | Export configuration information try { - FileExported result = apiInstance.handleExportFile(namespace, _file, fileExport); + FileExported result = apiInstance.handleExportFile(workspace, teamspace, _file, fileExport); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FilesApi#handleExportFile"); @@ -145,7 +148,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the file | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **_file** | **String**| The file identifier | | | **fileExport** | [**FileExport**](FileExport.md)| Export configuration information | | @@ -171,7 +175,7 @@ public class Example { # **handleUploadFile** -> FileUploaded handleUploadFile(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name) +> FileUploaded handleUploadFile(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name) @@ -204,13 +208,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); FilesApi apiInstance = new FilesApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the file + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to File inputFile = new File("/path/to/file"); // File | the file to upload String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = "X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME_example"; // String | Optional registered access credentials to use for creation String outputUri = "outputUri_example"; // String | output location of the TileDB File String name = "name_example"; // String | name to set for registered file try { - FileUploaded result = apiInstance.handleUploadFile(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); + FileUploaded result = apiInstance.handleUploadFile(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling FilesApi#handleUploadFile"); @@ -227,7 +232,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the file | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **inputFile** | **File**| the file to upload | | | **X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME** | **String**| Optional registered access credentials to use for creation | [optional] | | **outputUri** | **String**| output location of the TileDB File | [optional] | diff --git a/docs/GroupsApi.md b/docs/GroupsApi.md index 5e2a015..8a31860 100644 --- a/docs/GroupsApi.md +++ b/docs/GroupsApi.md @@ -4,28 +4,28 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**changeGroupContents**](GroupsApi.md#changeGroupContents) | **POST** /groups/{group_namespace}/{group_name}/contents | | -| [**createGroup**](GroupsApi.md#createGroup) | **POST** /groups/{namespace}/create | | -| [**deleteGroup**](GroupsApi.md#deleteGroup) | **DELETE** /groups/{group_namespace}/{group_name} | | -| [**getGroup**](GroupsApi.md#getGroup) | **GET** /groups/{group_namespace}/{group_name} | | -| [**getGroupActivity**](GroupsApi.md#getGroupActivity) | **GET** /groups/{group_namespace}/{group_name}/content_activity | | -| [**getGroupContents**](GroupsApi.md#getGroupContents) | **GET** /groups/{group_namespace}/{group_name}/contents | | -| [**getGroupSharingPolicies**](GroupsApi.md#getGroupSharingPolicies) | **GET** /groups/{group_namespace}/{group_name}/share | | +| [**changeGroupContents**](GroupsApi.md#changeGroupContents) | **POST** /groups/{workspace}/{teamspace}/{group_name}/contents | | +| [**createGroup**](GroupsApi.md#createGroup) | **POST** /groups/{workspace}/{teamspace}/create | | +| [**deleteGroup**](GroupsApi.md#deleteGroup) | **DELETE** /groups/{workspace}/{teamspace}/{group_name} | | +| [**getGroup**](GroupsApi.md#getGroup) | **GET** /groups/{workspace}/{teamspace}/{group_name} | | +| [**getGroupActivity**](GroupsApi.md#getGroupActivity) | **GET** /groups/{workspace}/{teamspace}/{group_name}/content_activity | | +| [**getGroupContents**](GroupsApi.md#getGroupContents) | **GET** /groups/{workspace}/{teamspace}/{group_name}/contents | | +| [**getGroupSharingPolicies**](GroupsApi.md#getGroupSharingPolicies) | **GET** /groups/{workspace}/{teamspace}/{group_name}/share | | | [**groupsBrowserOwnedFiltersGet**](GroupsApi.md#groupsBrowserOwnedFiltersGet) | **GET** /groups/browser/owned/filters | | | [**groupsBrowserPublicFiltersGet**](GroupsApi.md#groupsBrowserPublicFiltersGet) | **GET** /groups/browser/public/filters | | | [**groupsBrowserSharedFiltersGet**](GroupsApi.md#groupsBrowserSharedFiltersGet) | **GET** /groups/browser/shared/filters | | -| [**groupsGroupNamespaceGroupNameContentsFiltersGet**](GroupsApi.md#groupsGroupNamespaceGroupNameContentsFiltersGet) | **GET** /groups/{group_namespace}/{group_name}/contents/filters | | +| [**groupsWorkspaceTeamspaceGroupNameContentsFiltersGet**](GroupsApi.md#groupsWorkspaceTeamspaceGroupNameContentsFiltersGet) | **GET** /groups/{workspace}/{teamspace}/{group_name}/contents/filters | | | [**listOwnedGroups**](GroupsApi.md#listOwnedGroups) | **GET** /groups/browser/owned | | | [**listPublicGroups**](GroupsApi.md#listPublicGroups) | **GET** /groups/browser/public | | | [**listSharedGroups**](GroupsApi.md#listSharedGroups) | **GET** /groups/browser/shared | | -| [**registerGroup**](GroupsApi.md#registerGroup) | **POST** /groups/{namespace}/{array}/register | | -| [**shareGroup**](GroupsApi.md#shareGroup) | **PATCH** /groups/{group_namespace}/{group_name}/share | | -| [**updateGroup**](GroupsApi.md#updateGroup) | **PATCH** /groups/{group_namespace}/{group_name} | | +| [**registerGroup**](GroupsApi.md#registerGroup) | **POST** /groups/{workspace}/{teamspace}/{array}/register | | +| [**shareGroup**](GroupsApi.md#shareGroup) | **PATCH** /groups/{workspace}/{teamspace}/{group_name}/share | | +| [**updateGroup**](GroupsApi.md#updateGroup) | **PATCH** /groups/{workspace}/{teamspace}/{group_name} | | # **changeGroupContents** -> changeGroupContents(groupNamespace, groupName, groupChanges) +> changeGroupContents(workspace, teamspace, groupName, groupChanges) @@ -58,11 +58,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group GroupChanges groupChanges = new GroupChanges(); // GroupChanges | try { - apiInstance.changeGroupContents(groupNamespace, groupName, groupChanges); + apiInstance.changeGroupContents(workspace, teamspace, groupName, groupChanges); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#changeGroupContents"); System.err.println("Status code: " + e.getCode()); @@ -78,7 +79,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | | **groupChanges** | [**GroupChanges**](GroupChanges.md)| | [optional] | @@ -104,7 +106,7 @@ null (empty response body) # **createGroup** -> createGroup(namespace, groupCreate) +> createGroup(workspace, teamspace, groupCreate) @@ -137,10 +139,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to GroupCreate groupCreate = new GroupCreate(); // GroupCreate | try { - apiInstance.createGroup(namespace, groupCreate); + apiInstance.createGroup(workspace, teamspace, groupCreate); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#createGroup"); System.err.println("Status code: " + e.getCode()); @@ -156,7 +159,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupCreate** | [**GroupCreate**](GroupCreate.md)| | [optional] | ### Return type @@ -181,7 +185,7 @@ null (empty response body) # **deleteGroup** -> deleteGroup(groupNamespace, groupName) +> deleteGroup(workspace, teamspace, groupName) @@ -214,10 +218,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group try { - apiInstance.deleteGroup(groupNamespace, groupName); + apiInstance.deleteGroup(workspace, teamspace, groupName); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#deleteGroup"); System.err.println("Status code: " + e.getCode()); @@ -233,7 +238,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | ### Return type @@ -258,7 +264,7 @@ null (empty response body) # **getGroup** -> GroupInfo getGroup(groupNamespace, groupName) +> GroupInfo getGroup(workspace, teamspace, groupName) @@ -291,10 +297,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group try { - GroupInfo result = apiInstance.getGroup(groupNamespace, groupName); + GroupInfo result = apiInstance.getGroup(workspace, teamspace, groupName); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#getGroup"); @@ -311,7 +318,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | ### Return type @@ -336,7 +344,7 @@ public class Example { # **getGroupActivity** -> GroupContentActivityResponse getGroupActivity(groupNamespace, groupName, page, perPage) +> GroupContentActivityResponse getGroupActivity(workspace, teamspace, groupName, page, perPage) @@ -369,12 +377,13 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group Integer page = 56; // Integer | pagination offset Integer perPage = 56; // Integer | pagination limit try { - GroupContentActivityResponse result = apiInstance.getGroupActivity(groupNamespace, groupName, page, perPage); + GroupContentActivityResponse result = apiInstance.getGroupActivity(workspace, teamspace, groupName, page, perPage); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#getGroupActivity"); @@ -391,7 +400,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | | **page** | **Integer**| pagination offset | [optional] | | **perPage** | **Integer**| pagination limit | [optional] | @@ -418,7 +428,7 @@ public class Example { # **getGroupContents** -> GroupContents getGroupContents(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType) +> GroupContents getGroupContents(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType) @@ -451,7 +461,8 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group Integer page = 56; // Integer | pagination offset for assets Integer perPage = 56; // Integer | pagination limit for assets @@ -463,7 +474,7 @@ public class Example { List memberType = Arrays.asList(); // List | member type to search for, more than one can be included List excludeMemberType = Arrays.asList(); // List | member type to exclude matching groups in results, more than one can be included try { - GroupContents result = apiInstance.getGroupContents(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType); + GroupContents result = apiInstance.getGroupContents(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#getGroupContents"); @@ -480,7 +491,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | | **page** | **Integer**| pagination offset for assets | [optional] | | **perPage** | **Integer**| pagination limit for assets | [optional] | @@ -514,7 +526,7 @@ public class Example { # **getGroupSharingPolicies** -> List<GroupSharing> getGroupSharingPolicies(groupNamespace, groupName) +> List<GroupSharing> getGroupSharingPolicies(workspace, teamspace, groupName) @@ -547,10 +559,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group try { - List result = apiInstance.getGroupSharingPolicies(groupNamespace, groupName); + List result = apiInstance.getGroupSharingPolicies(workspace, teamspace, groupName); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#getGroupSharingPolicies"); @@ -567,7 +580,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | ### Return type @@ -815,9 +829,9 @@ public class Example { | **502** | Bad Gateway | - | | **0** | error response | - | - -# **groupsGroupNamespaceGroupNameContentsFiltersGet** -> GroupContentsFilterData groupsGroupNamespaceGroupNameContentsFiltersGet(groupNamespace, groupName) + +# **groupsWorkspaceTeamspaceGroupNameContentsFiltersGet** +> GroupContentsFilterData groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(workspace, teamspace, groupName) @@ -850,13 +864,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group try { - GroupContentsFilterData result = apiInstance.groupsGroupNamespaceGroupNameContentsFiltersGet(groupNamespace, groupName); + GroupContentsFilterData result = apiInstance.groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(workspace, teamspace, groupName); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling GroupsApi#groupsGroupNamespaceGroupNameContentsFiltersGet"); + System.err.println("Exception when calling GroupsApi#groupsWorkspaceTeamspaceGroupNameContentsFiltersGet"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -870,7 +885,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | ### Return type @@ -1191,7 +1207,7 @@ public class Example { # **registerGroup** -> registerGroup(namespace, array, groupRegister) +> registerGroup(workspace, teamspace, array, groupRegister) @@ -1224,11 +1240,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | The unique name or id of the group GroupRegister groupRegister = new GroupRegister(); // GroupRegister | try { - apiInstance.registerGroup(namespace, array, groupRegister); + apiInstance.registerGroup(workspace, teamspace, array, groupRegister); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#registerGroup"); System.err.println("Status code: " + e.getCode()); @@ -1244,7 +1261,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| The unique name or id of the group | | | **groupRegister** | [**GroupRegister**](GroupRegister.md)| | [optional] | @@ -1270,7 +1288,7 @@ null (empty response body) # **shareGroup** -> shareGroup(groupNamespace, groupName, groupSharingRequest) +> shareGroup(workspace, teamspace, groupName, groupSharingRequest) @@ -1303,11 +1321,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group GroupSharingRequest groupSharingRequest = new GroupSharingRequest(); // GroupSharingRequest | Namespace and list of permissions to share with. Sharing is recursive, it is applied to all reachable subgroups and arrays of the group. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the group will not be shared with the namespace at all. try { - apiInstance.shareGroup(groupNamespace, groupName, groupSharingRequest); + apiInstance.shareGroup(workspace, teamspace, groupName, groupSharingRequest); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#shareGroup"); System.err.println("Status code: " + e.getCode()); @@ -1323,7 +1342,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | | **groupSharingRequest** | [**GroupSharingRequest**](GroupSharingRequest.md)| Namespace and list of permissions to share with. Sharing is recursive, it is applied to all reachable subgroups and arrays of the group. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the group will not be shared with the namespace at all. | | @@ -1350,7 +1370,7 @@ null (empty response body) # **updateGroup** -> updateGroup(groupNamespace, groupName, groupUpdate) +> updateGroup(workspace, teamspace, groupName, groupUpdate) @@ -1383,11 +1403,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); GroupsApi apiInstance = new GroupsApi(defaultClient); - String groupNamespace = "groupNamespace_example"; // String | The namespace of the group + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String groupName = "groupName_example"; // String | The unique name or id of the group GroupUpdate groupUpdate = new GroupUpdate(); // GroupUpdate | try { - apiInstance.updateGroup(groupNamespace, groupName, groupUpdate); + apiInstance.updateGroup(workspace, teamspace, groupName, groupUpdate); } catch (ApiException e) { System.err.println("Exception when calling GroupsApi#updateGroup"); System.err.println("Status code: " + e.getCode()); @@ -1403,7 +1424,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **groupNamespace** | **String**| The namespace of the group | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **groupName** | **String**| The unique name or id of the group | | | **groupUpdate** | [**GroupUpdate**](GroupUpdate.md)| | [optional] | diff --git a/docs/InvitationApi.md b/docs/InvitationApi.md index 0e605d0..ad5ec0e 100644 --- a/docs/InvitationApi.md +++ b/docs/InvitationApi.md @@ -6,14 +6,14 @@ All URIs are relative to */v1* |------------- | ------------- | -------------| | [**acceptInvitation**](InvitationApi.md#acceptInvitation) | **POST** /invitations/{invitation} | | | [**cancelJoinOrganization**](InvitationApi.md#cancelJoinOrganization) | **DELETE** /invitations/{invitation}/{organization}/join | | -| [**cancelShareArrayByInvite**](InvitationApi.md#cancelShareArrayByInvite) | **DELETE** /invitations/{invitation}/{namespace}/{array}/share | | -| [**cancelShareGroupByInvite**](InvitationApi.md#cancelShareGroupByInvite) | **DELETE** /invitations/group/{invitation}/{namespace}/{group_name}/share | | -| [**cancelSharePayment**](InvitationApi.md#cancelSharePayment) | **DELETE** /invitations/share_payment/{namespace}/{target} | | +| [**cancelShareArrayByInvite**](InvitationApi.md#cancelShareArrayByInvite) | **DELETE** /invitations/{invitation}/{workspace}/{teamspace}/{array}/share | | +| [**cancelShareGroupByInvite**](InvitationApi.md#cancelShareGroupByInvite) | **DELETE** /invitations/group/{invitation}/{workspace}/{teamspace}/{group_name}/share | | +| [**cancelSharePayment**](InvitationApi.md#cancelSharePayment) | **DELETE** /invitations/share_payment/{workspace}/{teamspace}/{target} | | | [**fetchInvitations**](InvitationApi.md#fetchInvitations) | **GET** /invitations | | | [**joinOrganization**](InvitationApi.md#joinOrganization) | **POST** /invitations/{organization}/join | | -| [**shareArrayByInvite**](InvitationApi.md#shareArrayByInvite) | **POST** /invitations/{namespace}/{array}/share | | -| [**shareGroupByInvite**](InvitationApi.md#shareGroupByInvite) | **POST** /invitations/group/{namespace}/{group}/share | | -| [**sharePayment**](InvitationApi.md#sharePayment) | **POST** /invitations/share_payment/{namespace} | | +| [**shareArrayByInvite**](InvitationApi.md#shareArrayByInvite) | **POST** /invitations/{workspace}/{teamspace}/{array}/share | | +| [**shareGroupByInvite**](InvitationApi.md#shareGroupByInvite) | **POST** /invitations/group/{workspace}/{teamspace}/{group}/share | | +| [**sharePayment**](InvitationApi.md#sharePayment) | **POST** /invitations/share_payment/{workspace}/{teamspace} | | @@ -172,7 +172,7 @@ null (empty response body) # **cancelShareArrayByInvite** -> cancelShareArrayByInvite(namespace, invitation, array) +> cancelShareArrayByInvite(workspace, teamspace, invitation, array) @@ -205,11 +205,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); InvitationApi apiInstance = new InvitationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String invitation = "invitation_example"; // String | the ID of invitation about to be cancelled String array = "array_example"; // String | name/uri of array that is url-encoded try { - apiInstance.cancelShareArrayByInvite(namespace, invitation, array); + apiInstance.cancelShareArrayByInvite(workspace, teamspace, invitation, array); } catch (ApiException e) { System.err.println("Exception when calling InvitationApi#cancelShareArrayByInvite"); System.err.println("Status code: " + e.getCode()); @@ -225,7 +226,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **invitation** | **String**| the ID of invitation about to be cancelled | | | **array** | **String**| name/uri of array that is url-encoded | | @@ -252,7 +254,7 @@ null (empty response body) # **cancelShareGroupByInvite** -> cancelShareGroupByInvite(namespace, invitation, groupName) +> cancelShareGroupByInvite(workspace, teamspace, invitation, groupName) @@ -285,11 +287,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); InvitationApi apiInstance = new InvitationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace group is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String invitation = "invitation_example"; // String | the ID of invitation about to be cancelled String groupName = "groupName_example"; // String | name/uuid of group that is url-encoded try { - apiInstance.cancelShareGroupByInvite(namespace, invitation, groupName); + apiInstance.cancelShareGroupByInvite(workspace, teamspace, invitation, groupName); } catch (ApiException e) { System.err.println("Exception when calling InvitationApi#cancelShareGroupByInvite"); System.err.println("Status code: " + e.getCode()); @@ -305,7 +308,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace group is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **invitation** | **String**| the ID of invitation about to be cancelled | | | **groupName** | **String**| name/uuid of group that is url-encoded | | @@ -332,7 +336,7 @@ null (empty response body) # **cancelSharePayment** -> cancelSharePayment(namespace, target) +> cancelSharePayment(workspace, teamspace, target) @@ -365,10 +369,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); InvitationApi apiInstance = new InvitationApi(defaultClient); - String namespace = "namespace_example"; // String | name or UUID of namespace sharing their payment info + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String target = "target_example"; // String | name or UUID of recipient namespace try { - apiInstance.cancelSharePayment(namespace, target); + apiInstance.cancelSharePayment(workspace, teamspace, target); } catch (ApiException e) { System.err.println("Exception when calling InvitationApi#cancelSharePayment"); System.err.println("Status code: " + e.getCode()); @@ -384,7 +389,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| name or UUID of namespace sharing their payment info | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **target** | **String**| name or UUID of recipient namespace | | ### Return type @@ -582,7 +588,7 @@ null (empty response body) # **shareArrayByInvite** -> shareArrayByInvite(namespace, array, emailInvite) +> shareArrayByInvite(workspace, teamspace, array, emailInvite) @@ -615,11 +621,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); InvitationApi apiInstance = new InvitationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded InvitationArrayShareEmail emailInvite = new InvitationArrayShareEmail(); // InvitationArrayShareEmail | list of email recipients try { - apiInstance.shareArrayByInvite(namespace, array, emailInvite); + apiInstance.shareArrayByInvite(workspace, teamspace, array, emailInvite); } catch (ApiException e) { System.err.println("Exception when calling InvitationApi#shareArrayByInvite"); System.err.println("Status code: " + e.getCode()); @@ -635,7 +642,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **emailInvite** | [**InvitationArrayShareEmail**](InvitationArrayShareEmail.md)| list of email recipients | | @@ -663,7 +671,7 @@ null (empty response body) # **shareGroupByInvite** -> shareGroupByInvite(namespace, group, emailInvite) +> shareGroupByInvite(workspace, teamspace, group, emailInvite) @@ -696,11 +704,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); InvitationApi apiInstance = new InvitationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace group is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String group = "group_example"; // String | name/uri of group that is url-encoded InvitationGroupShareEmail emailInvite = new InvitationGroupShareEmail(); // InvitationGroupShareEmail | list of email/namespace recipients try { - apiInstance.shareGroupByInvite(namespace, group, emailInvite); + apiInstance.shareGroupByInvite(workspace, teamspace, group, emailInvite); } catch (ApiException e) { System.err.println("Exception when calling InvitationApi#shareGroupByInvite"); System.err.println("Status code: " + e.getCode()); @@ -716,7 +725,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace group is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **group** | **String**| name/uri of group that is url-encoded | | | **emailInvite** | [**InvitationGroupShareEmail**](InvitationGroupShareEmail.md)| list of email/namespace recipients | | @@ -744,7 +754,7 @@ null (empty response body) # **sharePayment** -> sharePayment(namespace, emailInvite) +> sharePayment(workspace, teamspace, emailInvite) @@ -777,10 +787,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); InvitationApi apiInstance = new InvitationApi(defaultClient); - String namespace = "namespace_example"; // String | name or UUID of namespace sharing their payment info + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to SharePaymentRequest emailInvite = new SharePaymentRequest(); // SharePaymentRequest | Recipients of the invitation. These may only be namespaces, not email addresses. try { - apiInstance.sharePayment(namespace, emailInvite); + apiInstance.sharePayment(workspace, teamspace, emailInvite); } catch (ApiException e) { System.err.println("Exception when calling InvitationApi#sharePayment"); System.err.println("Status code: " + e.getCode()); @@ -796,7 +807,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| name or UUID of namespace sharing their payment info | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **emailInvite** | [**SharePaymentRequest**](SharePaymentRequest.md)| Recipients of the invitation. These may only be namespaces, not email addresses. | [optional] | ### Return type diff --git a/docs/NotebookApi.md b/docs/NotebookApi.md index 6c4a51f..fffa49e 100644 --- a/docs/NotebookApi.md +++ b/docs/NotebookApi.md @@ -4,16 +4,16 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**getNotebookServerStatus**](NotebookApi.md#getNotebookServerStatus) | **GET** /notebooks/server/{namespace}/status | | -| [**handleCopyNotebook**](NotebookApi.md#handleCopyNotebook) | **POST** /notebooks/{namespace}/{array}/copy | | -| [**handleUploadNotebook**](NotebookApi.md#handleUploadNotebook) | **POST** /notebooks/{namespace}/upload | | -| [**shutdownNotebookServer**](NotebookApi.md#shutdownNotebookServer) | **DELETE** /notebooks/server/{namespace} | | -| [**updateNotebookName**](NotebookApi.md#updateNotebookName) | **PATCH** /notebooks/{namespace}/{array}/rename | | +| [**getNotebookServerStatus**](NotebookApi.md#getNotebookServerStatus) | **GET** /notebooks/server/{workspace}/{teamspace}/status | | +| [**handleCopyNotebook**](NotebookApi.md#handleCopyNotebook) | **POST** /notebooks/{workspace}/{teamspace}/{array}/copy | | +| [**handleUploadNotebook**](NotebookApi.md#handleUploadNotebook) | **POST** /notebooks/{workspace}/{teamspace}/upload | | +| [**shutdownNotebookServer**](NotebookApi.md#shutdownNotebookServer) | **DELETE** /notebooks/server/{workspace}/{teamspace} | | +| [**updateNotebookName**](NotebookApi.md#updateNotebookName) | **PATCH** /notebooks/{workspace}/{teamspace}/{array}/rename | | # **getNotebookServerStatus** -> NotebookStatus getNotebookServerStatus(namespace) +> NotebookStatus getNotebookServerStatus(workspace, teamspace) @@ -46,9 +46,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebookApi apiInstance = new NotebookApi(defaultClient); - String namespace = "namespace_example"; // String | namespace notebook is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to try { - NotebookStatus result = apiInstance.getNotebookServerStatus(namespace); + NotebookStatus result = apiInstance.getNotebookServerStatus(workspace, teamspace); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling NotebookApi#getNotebookServerStatus"); @@ -65,7 +66,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace notebook is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | ### Return type @@ -91,7 +93,7 @@ public class Example { # **handleCopyNotebook** -> NotebookCopied handleCopyNotebook(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp) +> NotebookCopied handleCopyNotebook(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp) @@ -124,13 +126,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebookApi apiInstance = new NotebookApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the notebook + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | The name of the notebook NotebookCopy notebookCopy = new NotebookCopy(); // NotebookCopy | Input/Output information to create a new TileDB file String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = "X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME_example"; // String | Optional registered access credentials to use for creation Integer endTimestamp = 56; // Integer | Milliseconds since Unix epoch, copy will use open_at functionality to copy notebook created at the specific timestamp try { - NotebookCopied result = apiInstance.handleCopyNotebook(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); + NotebookCopied result = apiInstance.handleCopyNotebook(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling NotebookApi#handleCopyNotebook"); @@ -147,7 +150,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the notebook | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| The name of the notebook | | | **notebookCopy** | [**NotebookCopy**](NotebookCopy.md)| Input/Output information to create a new TileDB file | | | **X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME** | **String**| Optional registered access credentials to use for creation | [optional] | @@ -175,7 +179,7 @@ public class Example { # **handleUploadNotebook** -> FileUploaded handleUploadNotebook(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name) +> FileUploaded handleUploadNotebook(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name) @@ -208,13 +212,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebookApi apiInstance = new NotebookApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace of the notebook + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to File inputFile = new File("/path/to/file"); // File | the notebook to upload String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = "X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME_example"; // String | Optional registered access credentials to use for creation String outputUri = "outputUri_example"; // String | output location of the TileDB File String name = "name_example"; // String | name to set for registered file try { - FileUploaded result = apiInstance.handleUploadNotebook(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); + FileUploaded result = apiInstance.handleUploadNotebook(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling NotebookApi#handleUploadNotebook"); @@ -231,7 +236,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace of the notebook | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **inputFile** | **File**| the notebook to upload | | | **X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME** | **String**| Optional registered access credentials to use for creation | [optional] | | **outputUri** | **String**| output location of the TileDB File | [optional] | @@ -259,7 +265,7 @@ public class Example { # **shutdownNotebookServer** -> shutdownNotebookServer(namespace) +> shutdownNotebookServer(workspace, teamspace) @@ -292,9 +298,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebookApi apiInstance = new NotebookApi(defaultClient); - String namespace = "namespace_example"; // String | namespace notebook is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to try { - apiInstance.shutdownNotebookServer(namespace); + apiInstance.shutdownNotebookServer(workspace, teamspace); } catch (ApiException e) { System.err.println("Exception when calling NotebookApi#shutdownNotebookServer"); System.err.println("Status code: " + e.getCode()); @@ -310,7 +317,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace notebook is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | ### Return type @@ -335,7 +343,7 @@ null (empty response body) # **updateNotebookName** -> updateNotebookName(namespace, array, notebookMetadata) +> updateNotebookName(workspace, teamspace, array, notebookMetadata) @@ -368,11 +376,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebookApi apiInstance = new NotebookApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of notebook (array) that is url-encoded ArrayInfoUpdate notebookMetadata = new ArrayInfoUpdate(); // ArrayInfoUpdate | notebook (array) metadata to update try { - apiInstance.updateNotebookName(namespace, array, notebookMetadata); + apiInstance.updateNotebookName(workspace, teamspace, array, notebookMetadata); } catch (ApiException e) { System.err.println("Exception when calling NotebookApi#updateNotebookName"); System.err.println("Status code: " + e.getCode()); @@ -388,7 +397,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of notebook (array) that is url-encoded | | | **notebookMetadata** | [**ArrayInfoUpdate**](ArrayInfoUpdate.md)| notebook (array) metadata to update | | diff --git a/docs/NotebooksApi.md b/docs/NotebooksApi.md index 0432197..d4b401b 100644 --- a/docs/NotebooksApi.md +++ b/docs/NotebooksApi.md @@ -4,13 +4,13 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**notebooksNamespaceArrayEndTimestampsGet**](NotebooksApi.md#notebooksNamespaceArrayEndTimestampsGet) | **GET** /notebooks/{namespace}/{array}/end_timestamps | | -| [**notebooksNamespaceArrayPrunePost**](NotebooksApi.md#notebooksNamespaceArrayPrunePost) | **POST** /notebooks/{namespace}/{array}/prune | | +| [**notebooksWorkspaceTeamspaceArrayEndTimestampsGet**](NotebooksApi.md#notebooksWorkspaceTeamspaceArrayEndTimestampsGet) | **GET** /notebooks/{workspace}/{teamspace}/{array}/end_timestamps | | +| [**notebooksWorkspaceTeamspaceArrayPrunePost**](NotebooksApi.md#notebooksWorkspaceTeamspaceArrayPrunePost) | **POST** /notebooks/{workspace}/{teamspace}/{array}/prune | | - -# **notebooksNamespaceArrayEndTimestampsGet** -> ArrayEndTimestampData notebooksNamespaceArrayEndTimestampsGet(namespace, array, page, perPage) + +# **notebooksWorkspaceTeamspaceArrayEndTimestampsGet** +> ArrayEndTimestampData notebooksWorkspaceTeamspaceArrayEndTimestampsGet(workspace, teamspace, array, page, perPage) @@ -43,15 +43,16 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebooksApi apiInstance = new NotebooksApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer page = 56; // Integer | pagination offset Integer perPage = 56; // Integer | pagination limit try { - ArrayEndTimestampData result = apiInstance.notebooksNamespaceArrayEndTimestampsGet(namespace, array, page, perPage); + ArrayEndTimestampData result = apiInstance.notebooksWorkspaceTeamspaceArrayEndTimestampsGet(workspace, teamspace, array, page, perPage); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling NotebooksApi#notebooksNamespaceArrayEndTimestampsGet"); + System.err.println("Exception when calling NotebooksApi#notebooksWorkspaceTeamspaceArrayEndTimestampsGet"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -65,7 +66,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **page** | **Integer**| pagination offset | [optional] | | **perPage** | **Integer**| pagination limit | [optional] | @@ -90,9 +92,9 @@ public class Example { | **502** | Bad Gateway | - | | **0** | error response | - | - -# **notebooksNamespaceArrayPrunePost** -> notebooksNamespaceArrayPrunePost(namespace, array, keepVersions) + +# **notebooksWorkspaceTeamspaceArrayPrunePost** +> notebooksWorkspaceTeamspaceArrayPrunePost(workspace, teamspace, array, keepVersions) @@ -125,13 +127,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); NotebooksApi apiInstance = new NotebooksApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer keepVersions = 56; // Integer | The number of most recents fragment to preserve try { - apiInstance.notebooksNamespaceArrayPrunePost(namespace, array, keepVersions); + apiInstance.notebooksWorkspaceTeamspaceArrayPrunePost(workspace, teamspace, array, keepVersions); } catch (ApiException e) { - System.err.println("Exception when calling NotebooksApi#notebooksNamespaceArrayPrunePost"); + System.err.println("Exception when calling NotebooksApi#notebooksWorkspaceTeamspaceArrayPrunePost"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -145,7 +148,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **keepVersions** | **Integer**| The number of most recents fragment to preserve | [optional] | diff --git a/docs/OrganizationApi.md b/docs/OrganizationApi.md index e257b59..5fc979e 100644 --- a/docs/OrganizationApi.md +++ b/docs/OrganizationApi.md @@ -4,14 +4,14 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**addAWSAccessCredentials**](OrganizationApi.md#addAWSAccessCredentials) | **POST** /credentials/{namespace}/aws | | +| [**addAWSAccessCredentials**](OrganizationApi.md#addAWSAccessCredentials) | **POST** /credentials/{workspace}/{teamspace}/aws | | | [**addUserToOrganization**](OrganizationApi.md#addUserToOrganization) | **POST** /organizations/{organization}/user | | -| [**checkAWSAccessCredentials**](OrganizationApi.md#checkAWSAccessCredentials) | **GET** /credentials/{namespace}/aws | | -| [**checkAWSAccessCredentialsByName**](OrganizationApi.md#checkAWSAccessCredentialsByName) | **GET** /credentials/{namespace}/aws/{name} | | +| [**checkAWSAccessCredentials**](OrganizationApi.md#checkAWSAccessCredentials) | **GET** /credentials/{workspace}/{teamspace}/aws | | +| [**checkAWSAccessCredentialsByName**](OrganizationApi.md#checkAWSAccessCredentialsByName) | **GET** /credentials/{workspace}/{teamspace}/aws/{name} | | | [**checkSSODomain**](OrganizationApi.md#checkSSODomain) | **POST** /organizations/{organization}/sso_domains/{uuid}/run_check | | | [**createOrganization**](OrganizationApi.md#createOrganization) | **POST** /organization | | | [**createSSODomain**](OrganizationApi.md#createSSODomain) | **POST** /organizations/{organization}/sso_domain | | -| [**deleteAWSAccessCredentials**](OrganizationApi.md#deleteAWSAccessCredentials) | **DELETE** /credentials/{namespace}/aws/{name} | | +| [**deleteAWSAccessCredentials**](OrganizationApi.md#deleteAWSAccessCredentials) | **DELETE** /credentials/{workspace}/{teamspace}/aws/{name} | | | [**deleteOrganization**](OrganizationApi.md#deleteOrganization) | **DELETE** /organizations/{organization} | | | [**deleteSSODomain**](OrganizationApi.md#deleteSSODomain) | **DELETE** /organizations/{organization}/sso_domains/{uuid} | | | [**deleteUserFromOrganization**](OrganizationApi.md#deleteUserFromOrganization) | **DELETE** /organizations/{organization}/{username} | | @@ -20,7 +20,7 @@ All URIs are relative to */v1* | [**getOrganizationUser**](OrganizationApi.md#getOrganizationUser) | **GET** /organizations/{organization}/{username} | | | [**getSSODomain**](OrganizationApi.md#getSSODomain) | **GET** /organizations/{organization}/sso_domains/{uuid} | | | [**getSSODomains**](OrganizationApi.md#getSSODomains) | **GET** /organizations/{organization}/sso_domains | | -| [**updateAWSAccessCredentials**](OrganizationApi.md#updateAWSAccessCredentials) | **PATCH** /credentials/{namespace}/aws/{name} | | +| [**updateAWSAccessCredentials**](OrganizationApi.md#updateAWSAccessCredentials) | **PATCH** /credentials/{workspace}/{teamspace}/aws/{name} | | | [**updateOrganization**](OrganizationApi.md#updateOrganization) | **PATCH** /organizations/{organization} | | | [**updateSSODomain**](OrganizationApi.md#updateSSODomain) | **PATCH** /organizations/{organization}/sso_domains/{uuid} | | | [**updateUserInOrganization**](OrganizationApi.md#updateUserInOrganization) | **PATCH** /organizations/{organization}/{username} | | @@ -28,7 +28,7 @@ All URIs are relative to */v1* # **addAWSAccessCredentials** -> addAWSAccessCredentials(namespace, awsAccessCredentials) +> addAWSAccessCredentials(workspace, teamspace, awsAccessCredentials) @@ -61,10 +61,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); OrganizationApi apiInstance = new OrganizationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to AWSAccessCredentials awsAccessCredentials = new AWSAccessCredentials(); // AWSAccessCredentials | aws access credentials to store for a namespace try { - apiInstance.addAWSAccessCredentials(namespace, awsAccessCredentials); + apiInstance.addAWSAccessCredentials(workspace, teamspace, awsAccessCredentials); } catch (ApiException e) { System.err.println("Exception when calling OrganizationApi#addAWSAccessCredentials"); System.err.println("Status code: " + e.getCode()); @@ -80,7 +81,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **awsAccessCredentials** | [**AWSAccessCredentials**](AWSAccessCredentials.md)| aws access credentials to store for a namespace | | ### Return type @@ -182,7 +184,7 @@ null (empty response body) # **checkAWSAccessCredentials** -> List<AWSAccessCredentials> checkAWSAccessCredentials(namespace) +> List<AWSAccessCredentials> checkAWSAccessCredentials(workspace, teamspace) @@ -215,9 +217,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); OrganizationApi apiInstance = new OrganizationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to try { - List result = apiInstance.checkAWSAccessCredentials(namespace); + List result = apiInstance.checkAWSAccessCredentials(workspace, teamspace); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling OrganizationApi#checkAWSAccessCredentials"); @@ -234,7 +237,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | ### Return type @@ -258,7 +262,7 @@ public class Example { # **checkAWSAccessCredentialsByName** -> AWSAccessCredentials checkAWSAccessCredentialsByName(namespace, name) +> AWSAccessCredentials checkAWSAccessCredentialsByName(workspace, teamspace, name) @@ -291,10 +295,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); OrganizationApi apiInstance = new OrganizationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to String name = "name_example"; // String | name try { - AWSAccessCredentials result = apiInstance.checkAWSAccessCredentialsByName(namespace, name); + AWSAccessCredentials result = apiInstance.checkAWSAccessCredentialsByName(workspace, teamspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling OrganizationApi#checkAWSAccessCredentialsByName"); @@ -311,7 +316,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **name** | **String**| name | | ### Return type @@ -565,7 +571,7 @@ public class Example { # **deleteAWSAccessCredentials** -> deleteAWSAccessCredentials(namespace, name) +> deleteAWSAccessCredentials(workspace, teamspace, name) @@ -598,10 +604,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); OrganizationApi apiInstance = new OrganizationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to String name = "name_example"; // String | name try { - apiInstance.deleteAWSAccessCredentials(namespace, name); + apiInstance.deleteAWSAccessCredentials(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling OrganizationApi#deleteAWSAccessCredentials"); System.err.println("Status code: " + e.getCode()); @@ -617,7 +624,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **name** | **String**| name | | ### Return type @@ -1252,7 +1260,7 @@ public class Example { # **updateAWSAccessCredentials** -> updateAWSAccessCredentials(namespace, name, awsAccessCredentials) +> updateAWSAccessCredentials(workspace, teamspace, name, awsAccessCredentials) @@ -1285,11 +1293,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); OrganizationApi apiInstance = new OrganizationApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to String name = "name_example"; // String | name AWSAccessCredentials awsAccessCredentials = new AWSAccessCredentials(); // AWSAccessCredentials | aws credentials to update try { - apiInstance.updateAWSAccessCredentials(namespace, name, awsAccessCredentials); + apiInstance.updateAWSAccessCredentials(workspace, teamspace, name, awsAccessCredentials); } catch (ApiException e) { System.err.println("Exception when calling OrganizationApi#updateAWSAccessCredentials"); System.err.println("Status code: " + e.getCode()); @@ -1305,7 +1314,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **name** | **String**| name | | | **awsAccessCredentials** | [**AWSAccessCredentials**](AWSAccessCredentials.md)| aws credentials to update | | diff --git a/docs/OrganizationRoles.md b/docs/OrganizationRoles.md index 764cc4a..e0c6f08 100644 --- a/docs/OrganizationRoles.md +++ b/docs/OrganizationRoles.md @@ -9,6 +9,8 @@ * `ADMIN` (value: `"admin"`) +* `READ_WRITE_DELETE` (value: `"read_write_delete"`) + * `READ_WRITE` (value: `"read_write"`) * `READ_ONLY` (value: `"read_only"`) diff --git a/docs/QueryApi.md b/docs/QueryApi.md index 226e72d..b4159db 100644 --- a/docs/QueryApi.md +++ b/docs/QueryApi.md @@ -4,16 +4,16 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**finalizeQuery**](QueryApi.md#finalizeQuery) | **POST** /arrays/{namespace}/{array}/query/finalize | | -| [**getEstResultSizes**](QueryApi.md#getEstResultSizes) | **POST** /arrays/{namespace}/{array}/query/est_result_sizes | | -| [**getFile**](QueryApi.md#getFile) | **GET** /arrays/{namespace}/{array}/query/get_file | | -| [**submitQuery**](QueryApi.md#submitQuery) | **POST** /arrays/{namespace}/{array}/query/submit | | -| [**submitQueryJson**](QueryApi.md#submitQueryJson) | **POST** /arrays/{namespace}/{array}/query/submit_query_json | | +| [**finalizeQuery**](QueryApi.md#finalizeQuery) | **POST** /arrays/{workspace}/{teamspace}/{array}/query/finalize | | +| [**getEstResultSizes**](QueryApi.md#getEstResultSizes) | **POST** /arrays/{workspace}/{teamspace}/{array}/query/est_result_sizes | | +| [**getFile**](QueryApi.md#getFile) | **GET** /arrays/{workspace}/{teamspace}/{array}/query/get_file | | +| [**submitQuery**](QueryApi.md#submitQuery) | **POST** /arrays/{workspace}/{teamspace}/{array}/query/submit | | +| [**submitQueryJson**](QueryApi.md#submitQueryJson) | **POST** /arrays/{workspace}/{teamspace}/{array}/query/submit_query_json | | # **finalizeQuery** -> Query finalizeQuery(namespace, array, type, contentType, query, xPayer, openAt) +> Query finalizeQuery(workspace, teamspace, array, type, contentType, query, xPayer, openAt) @@ -46,7 +46,8 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); QueryApi apiInstance = new QueryApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String type = "type_example"; // String | type of query String contentType = "application/json"; // String | Content Type of input and return mime @@ -54,7 +55,7 @@ public class Example { String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request Integer openAt = 56; // Integer | open_at for array in unix epoch try { - Query result = apiInstance.finalizeQuery(namespace, array, type, contentType, query, xPayer, openAt); + Query result = apiInstance.finalizeQuery(workspace, teamspace, array, type, contentType, query, xPayer, openAt); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling QueryApi#finalizeQuery"); @@ -71,7 +72,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **type** | **String**| type of query | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | @@ -102,7 +104,7 @@ public class Example { # **getEstResultSizes** -> Query getEstResultSizes(namespace, array, type, contentType, query, xPayer, openAt) +> Query getEstResultSizes(workspace, teamspace, array, type, contentType, query, xPayer, openAt) @@ -135,7 +137,8 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); QueryApi apiInstance = new QueryApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String type = "type_example"; // String | type of query String contentType = "application/json"; // String | Content Type of input and return mime @@ -143,7 +146,7 @@ public class Example { String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request Integer openAt = 56; // Integer | open_at for array in unix epoch try { - Query result = apiInstance.getEstResultSizes(namespace, array, type, contentType, query, xPayer, openAt); + Query result = apiInstance.getEstResultSizes(workspace, teamspace, array, type, contentType, query, xPayer, openAt); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling QueryApi#getEstResultSizes"); @@ -160,7 +163,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **type** | **String**| type of query | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | @@ -191,7 +195,7 @@ public class Example { # **getFile** -> File getFile(namespace, array, contentType, xPayer) +> File getFile(workspace, teamspace, array, contentType, xPayer) @@ -224,12 +228,13 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); QueryApi apiInstance = new QueryApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request try { - File result = apiInstance.getFile(namespace, array, contentType, xPayer); + File result = apiInstance.getFile(workspace, teamspace, array, contentType, xPayer); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling QueryApi#getFile"); @@ -246,7 +251,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | | **xPayer** | **String**| Name of organization or user who should be charged for this request | [optional] | @@ -273,7 +279,7 @@ public class Example { # **submitQuery** -> Query submitQuery(namespace, array, type, contentType, query, xPayer, openAt) +> Query submitQuery(workspace, teamspace, array, type, contentType, query, xPayer, openAt) @@ -306,7 +312,8 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); QueryApi apiInstance = new QueryApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String type = "type_example"; // String | type of query String contentType = "application/json"; // String | Content Type of input and return mime @@ -314,7 +321,7 @@ public class Example { String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request Integer openAt = 56; // Integer | open_at for array in unix epoch try { - Query result = apiInstance.submitQuery(namespace, array, type, contentType, query, xPayer, openAt); + Query result = apiInstance.submitQuery(workspace, teamspace, array, type, contentType, query, xPayer, openAt); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling QueryApi#submitQuery"); @@ -331,7 +338,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **type** | **String**| type of query | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | @@ -362,7 +370,7 @@ public class Example { # **submitQueryJson** -> Object submitQueryJson(namespace, array, contentType, queryJson, xPayer) +> Object submitQueryJson(workspace, teamspace, array, contentType, queryJson, xPayer) @@ -395,13 +403,14 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); QueryApi apiInstance = new QueryApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded String contentType = "application/json"; // String | Content Type of input and return mime QueryJson queryJson = new QueryJson(); // QueryJson | query to run String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request try { - Object result = apiInstance.submitQueryJson(namespace, array, contentType, queryJson, xPayer); + Object result = apiInstance.submitQueryJson(workspace, teamspace, array, contentType, queryJson, xPayer); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling QueryApi#submitQueryJson"); @@ -418,7 +427,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **contentType** | **String**| Content Type of input and return mime | [default to application/json] | | **queryJson** | [**QueryJson**](QueryJson.md)| query to run | | diff --git a/docs/RegisteredTaskGraphsApi.md b/docs/RegisteredTaskGraphsApi.md index dbbafb9..f95d794 100644 --- a/docs/RegisteredTaskGraphsApi.md +++ b/docs/RegisteredTaskGraphsApi.md @@ -4,17 +4,17 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**deleteRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#deleteRegisteredTaskGraph) | **DELETE** /taskgraphs/{namespace}/registered/{name} | | -| [**getRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#getRegisteredTaskGraph) | **GET** /taskgraphs/{namespace}/registered/{name} | | -| [**getRegisteredTaskGraphSharingPolicies**](RegisteredTaskGraphsApi.md#getRegisteredTaskGraphSharingPolicies) | **GET** /taskgraphs/{namespace}/registered/{name}/share | | -| [**registerRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#registerRegisteredTaskGraph) | **POST** /taskgraphs/{namespace}/registered/{name} | | -| [**shareRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#shareRegisteredTaskGraph) | **PATCH** /taskgraphs/{namespace}/registered/{name}/share | | -| [**updateRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#updateRegisteredTaskGraph) | **PATCH** /taskgraphs/{namespace}/registered/{name} | | +| [**deleteRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#deleteRegisteredTaskGraph) | **DELETE** /taskgraphs/{workspace}/registered/{name} | | +| [**getRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#getRegisteredTaskGraph) | **GET** /taskgraphs/{workspace}/registered/{name} | | +| [**getRegisteredTaskGraphSharingPolicies**](RegisteredTaskGraphsApi.md#getRegisteredTaskGraphSharingPolicies) | **GET** /taskgraphs/{workspace}/registered/{name}/share | | +| [**registerRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#registerRegisteredTaskGraph) | **POST** /taskgraphs/{workspace}/registered/{name} | | +| [**shareRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#shareRegisteredTaskGraph) | **PATCH** /taskgraphs/{workspace}/registered/{name}/share | | +| [**updateRegisteredTaskGraph**](RegisteredTaskGraphsApi.md#updateRegisteredTaskGraph) | **PATCH** /taskgraphs/{workspace}/registered/{name} | | # **deleteRegisteredTaskGraph** -> deleteRegisteredTaskGraph(namespace, name) +> deleteRegisteredTaskGraph(workspace, name) @@ -47,10 +47,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); RegisteredTaskGraphsApi apiInstance = new RegisteredTaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this registered UDF. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the registered task graph. try { - apiInstance.deleteRegisteredTaskGraph(namespace, name); + apiInstance.deleteRegisteredTaskGraph(workspace, name); } catch (ApiException e) { System.err.println("Exception when calling RegisteredTaskGraphsApi#deleteRegisteredTaskGraph"); System.err.println("Status code: " + e.getCode()); @@ -66,7 +66,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this registered UDF. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the registered task graph. | | ### Return type @@ -91,7 +91,7 @@ null (empty response body) # **getRegisteredTaskGraph** -> RegisteredTaskGraph getRegisteredTaskGraph(namespace, name) +> RegisteredTaskGraph getRegisteredTaskGraph(workspace, name) @@ -124,10 +124,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); RegisteredTaskGraphsApi apiInstance = new RegisteredTaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this registered UDF. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the registered task graph. try { - RegisteredTaskGraph result = apiInstance.getRegisteredTaskGraph(namespace, name); + RegisteredTaskGraph result = apiInstance.getRegisteredTaskGraph(workspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling RegisteredTaskGraphsApi#getRegisteredTaskGraph"); @@ -144,7 +144,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this registered UDF. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the registered task graph. | | ### Return type @@ -169,7 +169,7 @@ public class Example { # **getRegisteredTaskGraphSharingPolicies** -> List<TaskGraphSharing> getRegisteredTaskGraphSharingPolicies(namespace, name) +> List<TaskGraphSharing> getRegisteredTaskGraphSharingPolicies(workspace, name) @@ -202,10 +202,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); RegisteredTaskGraphsApi apiInstance = new RegisteredTaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns the registered task graph. + String workspace = "workspace_example"; // String | The workspace that owns the registered task graph. String name = "name_example"; // String | The name of the task graph. try { - List result = apiInstance.getRegisteredTaskGraphSharingPolicies(namespace, name); + List result = apiInstance.getRegisteredTaskGraphSharingPolicies(workspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling RegisteredTaskGraphsApi#getRegisteredTaskGraphSharingPolicies"); @@ -222,7 +222,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns the registered task graph. | | +| **workspace** | **String**| The workspace that owns the registered task graph. | | | **name** | **String**| The name of the task graph. | | ### Return type @@ -248,7 +248,7 @@ public class Example { # **registerRegisteredTaskGraph** -> registerRegisteredTaskGraph(namespace, name, graph) +> registerRegisteredTaskGraph(workspace, name, graph) @@ -281,11 +281,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); RegisteredTaskGraphsApi apiInstance = new RegisteredTaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this registered UDF. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the registered task graph. RegisteredTaskGraph graph = new RegisteredTaskGraph(); // RegisteredTaskGraph | Task graph to register. try { - apiInstance.registerRegisteredTaskGraph(namespace, name, graph); + apiInstance.registerRegisteredTaskGraph(workspace, name, graph); } catch (ApiException e) { System.err.println("Exception when calling RegisteredTaskGraphsApi#registerRegisteredTaskGraph"); System.err.println("Status code: " + e.getCode()); @@ -301,7 +301,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this registered UDF. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the registered task graph. | | | **graph** | [**RegisteredTaskGraph**](RegisteredTaskGraph.md)| Task graph to register. | [optional] | @@ -327,7 +327,7 @@ null (empty response body) # **shareRegisteredTaskGraph** -> shareRegisteredTaskGraph(namespace, name, taskGraphSharing) +> shareRegisteredTaskGraph(workspace, name, taskGraphSharing) @@ -360,11 +360,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); RegisteredTaskGraphsApi apiInstance = new RegisteredTaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns the registered task graph. + String workspace = "workspace_example"; // String | The workspace that owns the registered task graph. String name = "name_example"; // String | The name of the task graph. TaskGraphSharing taskGraphSharing = new TaskGraphSharing(); // TaskGraphSharing | Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. try { - apiInstance.shareRegisteredTaskGraph(namespace, name, taskGraphSharing); + apiInstance.shareRegisteredTaskGraph(workspace, name, taskGraphSharing); } catch (ApiException e) { System.err.println("Exception when calling RegisteredTaskGraphsApi#shareRegisteredTaskGraph"); System.err.println("Status code: " + e.getCode()); @@ -380,7 +380,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns the registered task graph. | | +| **workspace** | **String**| The workspace that owns the registered task graph. | | | **name** | **String**| The name of the task graph. | | | **taskGraphSharing** | [**TaskGraphSharing**](TaskGraphSharing.md)| Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. | | @@ -407,7 +407,7 @@ null (empty response body) # **updateRegisteredTaskGraph** -> updateRegisteredTaskGraph(namespace, name, graph) +> updateRegisteredTaskGraph(workspace, name, graph) @@ -440,11 +440,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); RegisteredTaskGraphsApi apiInstance = new RegisteredTaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this registered UDF. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | The name of the registered task graph. RegisteredTaskGraph graph = new RegisteredTaskGraph(); // RegisteredTaskGraph | The new contents of the task graph. try { - apiInstance.updateRegisteredTaskGraph(namespace, name, graph); + apiInstance.updateRegisteredTaskGraph(workspace, name, graph); } catch (ApiException e) { System.err.println("Exception when calling RegisteredTaskGraphsApi#updateRegisteredTaskGraph"); System.err.println("Status code: " + e.getCode()); @@ -460,7 +460,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this registered UDF. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| The name of the registered task graph. | | | **graph** | [**RegisteredTaskGraph**](RegisteredTaskGraph.md)| The new contents of the task graph. | [optional] | diff --git a/docs/SqlApi.md b/docs/SqlApi.md index 0f8feeb..c8167dc 100644 --- a/docs/SqlApi.md +++ b/docs/SqlApi.md @@ -4,12 +4,12 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**runSQL**](SqlApi.md#runSQL) | **POST** /sql/{namespace} | | +| [**runSQL**](SqlApi.md#runSQL) | **POST** /sql/{workspace}/{teamspace} | | # **runSQL** -> List<Map<String, Object>> runSQL(namespace, sql, acceptEncoding) +> List<Map<String, Object>> runSQL(workspace, teamspace, sql, acceptEncoding) @@ -42,11 +42,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); SqlApi apiInstance = new SqlApi(defaultClient); - String namespace = "namespace_example"; // String | namespace to run task under is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the sql query belongs to SQLParameters sql = new SQLParameters(); // SQLParameters | sql being submitted String acceptEncoding = "acceptEncoding_example"; // String | Encoding to use try { - List> result = apiInstance.runSQL(namespace, sql, acceptEncoding); + List> result = apiInstance.runSQL(workspace, teamspace, sql, acceptEncoding); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling SqlApi#runSQL"); @@ -63,7 +64,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace to run task under is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the sql query belongs to | | | **sql** | [**SQLParameters**](SQLParameters.md)| sql being submitted | | | **acceptEncoding** | **String**| Encoding to use | [optional] | diff --git a/docs/TGUDFEnvironment.md b/docs/TGUDFEnvironment.md index 0d4ed3e..b641109 100644 --- a/docs/TGUDFEnvironment.md +++ b/docs/TGUDFEnvironment.md @@ -17,7 +17,7 @@ Metadata about the environment where we want to execute a UDF. |**resources** | [**TGUDFEnvironmentResources**](TGUDFEnvironmentResources.md) | | [optional] | |**runClientSide** | **Boolean** | A hint that, if possible, this function should be executed on the client side rather than on the server. Registered UDFs and functions which take arrays as inputs can never be executed client-side. If the client’s environment is incompatible, or the client does not support client-side execution, the function will be executed on the server. | [optional] | |**timeout** | **BigDecimal** | The maximum length of time this UDF is allowed to execute for before it is killed and fails. If not present (or zero), the function is allowed to run indefinitely (subject to the server’s global limits). | [optional] | -|**paths** | **List<Object>** | Mapping for storage paths to mount | [optional] | +|**storage** | [**List<TGUDFStorage>**](TGUDFStorage.md) | Storage options for mounting persistent volumes. | [optional] | diff --git a/docs/TGUDFStorage.md b/docs/TGUDFStorage.md index 0bf99ea..d83b38a 100644 --- a/docs/TGUDFStorage.md +++ b/docs/TGUDFStorage.md @@ -2,15 +2,16 @@ # TGUDFStorage -Storage mount details +Storage options for mounting persistent volumes. ## Properties | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**path** | **String** | mount path | [optional] | -|**size** | **Integer** | storage size in bytes | [optional] | -|**storageClass** | **String** | storage class | [optional] | +|**path** | **String** | Mount path for the attached volume. | [optional] | +|**tiledbUri** | **String** | TileDB filesystem to mount | [optional] | +|**size** | **String** | Storage size. | [optional] | +|**storageClass** | **String** | Storage class to use for creating the volume. | [optional] | diff --git a/docs/TaskGraphLog.md b/docs/TaskGraphLog.md index de630c8..837a039 100644 --- a/docs/TaskGraphLog.md +++ b/docs/TaskGraphLog.md @@ -26,6 +26,8 @@ Logging information about the execution of a task graph. |**taskGraphId** | **String** | The UUID of the task graph. | [optional] | |**cloudProvider** | **String** | The name of the cloud provider where this task graph executed. | [optional] | |**cloudRegion** | **String** | The region of the cloud provider where this task graph executed. | [optional] | +|**rootTaskGraphUuid** | **String** | The UUID of the root taskgraph that this taskgraph is related to. This is used to provide consistent tracking and UI view for graphs that are executed by a set of taskgraphs. | [optional] | +|**childrenTaskGraphUuids** | **List<String>** | If this is a root taskgraph, this contains the list of all its children taskgraph UUIDs. | [optional] | diff --git a/docs/TaskGraphLogsApi.md b/docs/TaskGraphLogsApi.md index b32e444..9cf7d39 100644 --- a/docs/TaskGraphLogsApi.md +++ b/docs/TaskGraphLogsApi.md @@ -4,20 +4,20 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**createTaskGraphLog**](TaskGraphLogsApi.md#createTaskGraphLog) | **POST** /taskgraphs/{namespace}/log | | -| [**getTaskGraphLog**](TaskGraphLogsApi.md#getTaskGraphLog) | **GET** /taskgraphs/{namespace}/logs/{id} | | +| [**createTaskGraphLog**](TaskGraphLogsApi.md#createTaskGraphLog) | **POST** /taskgraphs/{workspace}/log | | +| [**getTaskGraphLog**](TaskGraphLogsApi.md#getTaskGraphLog) | **GET** /taskgraphs/{workspace}/logs/{id} | | | [**listTaskGraphLogs**](TaskGraphLogsApi.md#listTaskGraphLogs) | **GET** /taskgraphs/logs | | -| [**reportClientNode**](TaskGraphLogsApi.md#reportClientNode) | **POST** /taskgraphs/{namespace}/logs/{id}/report_client_node | | -| [**resubmitTaskGraphExecution**](TaskGraphLogsApi.md#resubmitTaskGraphExecution) | **POST** /taskgraphs/{namespace}/executions/{id}/resubmit | | -| [**retryTaskGraphExecution**](TaskGraphLogsApi.md#retryTaskGraphExecution) | **POST** /taskgraphs/{namespace}/executions/{id}/retry | | -| [**stopTaskGraphExecution**](TaskGraphLogsApi.md#stopTaskGraphExecution) | **POST** /taskgraphs/{namespace}/executions/{id}/stop | | -| [**submitTaskGraph**](TaskGraphLogsApi.md#submitTaskGraph) | **POST** /taskgraphs/{namespace}/graphs/{id}/submit | | -| [**updateTaskGraphLog**](TaskGraphLogsApi.md#updateTaskGraphLog) | **PATCH** /taskgraphs/{namespace}/logs/{id} | | +| [**reportClientNode**](TaskGraphLogsApi.md#reportClientNode) | **POST** /taskgraphs/{workspace}/logs/{id}/report_client_node | | +| [**resubmitTaskGraphExecution**](TaskGraphLogsApi.md#resubmitTaskGraphExecution) | **POST** /taskgraphs/{workspace}/executions/{id}/resubmit | | +| [**retryTaskGraphExecution**](TaskGraphLogsApi.md#retryTaskGraphExecution) | **POST** /taskgraphs/{workspace}/executions/{id}/retry | | +| [**stopTaskGraphExecution**](TaskGraphLogsApi.md#stopTaskGraphExecution) | **POST** /taskgraphs/{workspace}/executions/{id}/stop | | +| [**submitTaskGraph**](TaskGraphLogsApi.md#submitTaskGraph) | **POST** /taskgraphs/{workspace}/graphs/{id}/submit | | +| [**updateTaskGraphLog**](TaskGraphLogsApi.md#updateTaskGraphLog) | **PATCH** /taskgraphs/{workspace}/logs/{id} | | # **createTaskGraphLog** -> TaskGraphLog createTaskGraphLog(namespace, log) +> TaskGraphLog createTaskGraphLog(workspace, log) @@ -50,10 +50,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that will own this task graph log. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to TaskGraphLog log = new TaskGraphLog(); // TaskGraphLog | try { - TaskGraphLog result = apiInstance.createTaskGraphLog(namespace, log); + TaskGraphLog result = apiInstance.createTaskGraphLog(workspace, log); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#createTaskGraphLog"); @@ -70,7 +70,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that will own this task graph log. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **log** | [**TaskGraphLog**](TaskGraphLog.md)| | | ### Return type @@ -95,7 +95,7 @@ public class Example { # **getTaskGraphLog** -> TaskGraphLog getTaskGraphLog(namespace, id) +> TaskGraphLog getTaskGraphLog(workspace, id) @@ -128,10 +128,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph log. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph log entry. try { - TaskGraphLog result = apiInstance.getTaskGraphLog(namespace, id); + TaskGraphLog result = apiInstance.getTaskGraphLog(workspace, id); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#getTaskGraphLog"); @@ -148,7 +148,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph log. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph log entry. | | ### Return type @@ -263,7 +263,7 @@ public class Example { # **reportClientNode** -> reportClientNode(namespace, id, report) +> reportClientNode(workspace, id, report) @@ -294,11 +294,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph log. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph log entry. TaskGraphClientNodeStatus report = new TaskGraphClientNodeStatus(); // TaskGraphClientNodeStatus | The node status to report. try { - apiInstance.reportClientNode(namespace, id, report); + apiInstance.reportClientNode(workspace, id, report); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#reportClientNode"); System.err.println("Status code: " + e.getCode()); @@ -314,7 +314,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph log. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph log entry. | | | **report** | [**TaskGraphClientNodeStatus**](TaskGraphClientNodeStatus.md)| The node status to report. | | @@ -340,7 +340,7 @@ null (empty response body) # **resubmitTaskGraphExecution** -> TaskGraphLog resubmitTaskGraphExecution(namespace, id) +> TaskGraphLog resubmitTaskGraphExecution(workspace, id) @@ -373,10 +373,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph execution. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph execution (TaskGraphLog). try { - TaskGraphLog result = apiInstance.resubmitTaskGraphExecution(namespace, id); + TaskGraphLog result = apiInstance.resubmitTaskGraphExecution(workspace, id); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#resubmitTaskGraphExecution"); @@ -393,7 +393,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph execution. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph execution (TaskGraphLog). | | ### Return type @@ -418,7 +418,7 @@ public class Example { # **retryTaskGraphExecution** -> TaskGraphLog retryTaskGraphExecution(namespace, id) +> TaskGraphLog retryTaskGraphExecution(workspace, id) @@ -451,10 +451,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph execution. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph execution (TaskGraphLog). try { - TaskGraphLog result = apiInstance.retryTaskGraphExecution(namespace, id); + TaskGraphLog result = apiInstance.retryTaskGraphExecution(workspace, id); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#retryTaskGraphExecution"); @@ -471,7 +471,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph execution. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph execution (TaskGraphLog). | | ### Return type @@ -496,7 +496,7 @@ public class Example { # **stopTaskGraphExecution** -> stopTaskGraphExecution(namespace, id) +> stopTaskGraphExecution(workspace, id) @@ -529,10 +529,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph execution. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph execution (TaskGraphLog). try { - apiInstance.stopTaskGraphExecution(namespace, id); + apiInstance.stopTaskGraphExecution(workspace, id); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#stopTaskGraphExecution"); System.err.println("Status code: " + e.getCode()); @@ -548,7 +548,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph execution. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph execution (TaskGraphLog). | | ### Return type @@ -573,7 +573,7 @@ null (empty response body) # **submitTaskGraph** -> TaskGraphLog submitTaskGraph(namespace, id) +> TaskGraphLog submitTaskGraph(workspace, id, rootTaskGraphUuid) @@ -606,10 +606,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph entry. + String rootTaskGraphUuid = "rootTaskGraphUuid_example"; // String | UUID of the root taskgraph that this graph is assosiated with try { - TaskGraphLog result = apiInstance.submitTaskGraph(namespace, id); + TaskGraphLog result = apiInstance.submitTaskGraph(workspace, id, rootTaskGraphUuid); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#submitTaskGraph"); @@ -626,8 +627,9 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph entry. | | +| **rootTaskGraphUuid** | **String**| UUID of the root taskgraph that this graph is assosiated with | [optional] | ### Return type @@ -651,7 +653,7 @@ public class Example { # **updateTaskGraphLog** -> updateTaskGraphLog(namespace, id, log) +> updateTaskGraphLog(workspace, id, log) @@ -684,11 +686,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphLogsApi apiInstance = new TaskGraphLogsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph log. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph log entry. TaskGraphLog log = new TaskGraphLog(); // TaskGraphLog | Updates to make to the task graph log. The only manual update that a client should need to make to a task graph log is to update its completion status to `succeeded`, `failed`, or `cancelled`. try { - apiInstance.updateTaskGraphLog(namespace, id, log); + apiInstance.updateTaskGraphLog(workspace, id, log); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphLogsApi#updateTaskGraphLog"); System.err.println("Status code: " + e.getCode()); @@ -704,7 +706,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph log. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph log entry. | | | **log** | [**TaskGraphLog**](TaskGraphLog.md)| Updates to make to the task graph log. The only manual update that a client should need to make to a task graph log is to update its completion status to `succeeded`, `failed`, or `cancelled`. | | diff --git a/docs/TaskGraphType.md b/docs/TaskGraphType.md index 3632126..6218d10 100644 --- a/docs/TaskGraphType.md +++ b/docs/TaskGraphType.md @@ -9,5 +9,7 @@ * `REALTIME` (value: `"realtime"`) +* `NEXTFLOW` (value: `"nextflow"`) + diff --git a/docs/TaskGraphsApi.md b/docs/TaskGraphsApi.md index cc5f736..ff259ab 100644 --- a/docs/TaskGraphsApi.md +++ b/docs/TaskGraphsApi.md @@ -4,16 +4,16 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**createTaskGraph**](TaskGraphsApi.md#createTaskGraph) | **POST** /taskgraphs/{namespace}/graphs | | -| [**getTaskGraph**](TaskGraphsApi.md#getTaskGraph) | **GET** /taskgraphs/{namespace}/graphs/{id} | | -| [**listTaskGraphs**](TaskGraphsApi.md#listTaskGraphs) | **GET** /taskgraphs/{namespace}/graphs | | -| [**submitTaskGraph**](TaskGraphsApi.md#submitTaskGraph) | **POST** /taskgraphs/{namespace}/graphs/{id}/submit | | -| [**updateTaskGraph**](TaskGraphsApi.md#updateTaskGraph) | **PATCH** /taskgraphs/{namespace}/graphs/{id} | | +| [**createTaskGraph**](TaskGraphsApi.md#createTaskGraph) | **POST** /taskgraphs/{workspace}/graphs | | +| [**getTaskGraph**](TaskGraphsApi.md#getTaskGraph) | **GET** /taskgraphs/{workspace}/graphs/{id} | | +| [**listTaskGraphs**](TaskGraphsApi.md#listTaskGraphs) | **GET** /taskgraphs/{workspace}/graphs | | +| [**submitTaskGraph**](TaskGraphsApi.md#submitTaskGraph) | **POST** /taskgraphs/{workspace}/graphs/{id}/submit | | +| [**updateTaskGraph**](TaskGraphsApi.md#updateTaskGraph) | **PATCH** /taskgraphs/{workspace}/graphs/{id} | | # **createTaskGraph** -> TaskGraph createTaskGraph(namespace, graph) +> TaskGraph createTaskGraph(workspace, graph) @@ -46,10 +46,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphsApi apiInstance = new TaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | Include graphs for this namespace. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to TaskGraph graph = new TaskGraph(); // TaskGraph | Create the task graph. try { - TaskGraph result = apiInstance.createTaskGraph(namespace, graph); + TaskGraph result = apiInstance.createTaskGraph(workspace, graph); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphsApi#createTaskGraph"); @@ -66,7 +66,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| Include graphs for this namespace. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **graph** | [**TaskGraph**](TaskGraph.md)| Create the task graph. | | ### Return type @@ -91,7 +91,7 @@ public class Example { # **getTaskGraph** -> TaskGraph getTaskGraph(namespace, id) +> TaskGraph getTaskGraph(workspace, id) @@ -124,10 +124,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphsApi apiInstance = new TaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph entry. try { - TaskGraph result = apiInstance.getTaskGraph(namespace, id); + TaskGraph result = apiInstance.getTaskGraph(workspace, id); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphsApi#getTaskGraph"); @@ -144,7 +144,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph entry. | | ### Return type @@ -169,7 +169,7 @@ public class Example { # **listTaskGraphs** -> TaskGraphs listTaskGraphs(namespace) +> TaskGraphs listTaskGraphs(workspace) @@ -202,9 +202,9 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphsApi apiInstance = new TaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | Namespace for graphs + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to try { - TaskGraphs result = apiInstance.listTaskGraphs(namespace); + TaskGraphs result = apiInstance.listTaskGraphs(workspace); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphsApi#listTaskGraphs"); @@ -221,7 +221,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| Namespace for graphs | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | ### Return type @@ -245,7 +245,7 @@ public class Example { # **submitTaskGraph** -> TaskGraphLog submitTaskGraph(namespace, id) +> TaskGraphLog submitTaskGraph(workspace, id, rootTaskGraphUuid) @@ -278,10 +278,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphsApi apiInstance = new TaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph entry. + String rootTaskGraphUuid = "rootTaskGraphUuid_example"; // String | UUID of the root taskgraph that this graph is assosiated with try { - TaskGraphLog result = apiInstance.submitTaskGraph(namespace, id); + TaskGraphLog result = apiInstance.submitTaskGraph(workspace, id, rootTaskGraphUuid); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphsApi#submitTaskGraph"); @@ -298,8 +299,9 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph entry. | | +| **rootTaskGraphUuid** | **String**| UUID of the root taskgraph that this graph is assosiated with | [optional] | ### Return type @@ -323,7 +325,7 @@ public class Example { # **updateTaskGraph** -> updateTaskGraph(namespace, id, graph) +> updateTaskGraph(workspace, id, graph) @@ -356,11 +358,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TaskGraphsApi apiInstance = new TaskGraphsApi(defaultClient); - String namespace = "namespace_example"; // String | The namespace that owns this task graph. + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String id = "id_example"; // String | The UUID of the task graph entry. TaskGraph graph = new TaskGraph(); // TaskGraph | Updates to make to the task graph. try { - apiInstance.updateTaskGraph(namespace, id, graph); + apiInstance.updateTaskGraph(workspace, id, graph); } catch (ApiException e) { System.err.println("Exception when calling TaskGraphsApi#updateTaskGraph"); System.err.println("Status code: " + e.getCode()); @@ -376,7 +378,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| The namespace that owns this task graph. | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **id** | **String**| The UUID of the task graph entry. | | | **graph** | [**TaskGraph**](TaskGraph.md)| Updates to make to the task graph. | | diff --git a/docs/TasksApi.md b/docs/TasksApi.md index 61e4e3a..160cb10 100644 --- a/docs/TasksApi.md +++ b/docs/TasksApi.md @@ -4,7 +4,7 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**runSQL**](TasksApi.md#runSQL) | **POST** /sql/{namespace} | | +| [**runSQL**](TasksApi.md#runSQL) | **POST** /sql/{workspace}/{teamspace} | | | [**taskIdGet**](TasksApi.md#taskIdGet) | **GET** /task/{id} | | | [**taskIdResultGet**](TasksApi.md#taskIdResultGet) | **GET** /task/{id}/result | | | [**tasksGet**](TasksApi.md#tasksGet) | **GET** /tasks | | @@ -12,7 +12,7 @@ All URIs are relative to */v1* # **runSQL** -> List<Map<String, Object>> runSQL(namespace, sql, acceptEncoding) +> List<Map<String, Object>> runSQL(workspace, teamspace, sql, acceptEncoding) @@ -45,11 +45,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); TasksApi apiInstance = new TasksApi(defaultClient); - String namespace = "namespace_example"; // String | namespace to run task under is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the sql query belongs to SQLParameters sql = new SQLParameters(); // SQLParameters | sql being submitted String acceptEncoding = "acceptEncoding_example"; // String | Encoding to use try { - List> result = apiInstance.runSQL(namespace, sql, acceptEncoding); + List> result = apiInstance.runSQL(workspace, teamspace, sql, acceptEncoding); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling TasksApi#runSQL"); @@ -66,7 +67,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace to run task under is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the sql query belongs to | | | **sql** | [**SQLParameters**](SQLParameters.md)| sql being submitted | | | **acceptEncoding** | **String**| Encoding to use | [optional] | diff --git a/docs/UdfApi.md b/docs/UdfApi.md index 88929df..32f3893 100644 --- a/docs/UdfApi.md +++ b/docs/UdfApi.md @@ -4,22 +4,22 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**deleteUDFInfo**](UdfApi.md#deleteUDFInfo) | **DELETE** /udf/{namespace}/{name} | | -| [**getUDFInfo**](UdfApi.md#getUDFInfo) | **GET** /udf/{namespace}/{name} | | -| [**getUDFInfoSharingPolicies**](UdfApi.md#getUDFInfoSharingPolicies) | **GET** /udf/{namespace}/{name}/share | | -| [**handleCopyUDF**](UdfApi.md#handleCopyUDF) | **POST** /udf/{namespace}/{name}/copy | | -| [**registerUDFInfo**](UdfApi.md#registerUDFInfo) | **POST** /udf/{namespace}/{name} | | -| [**shareUDFInfo**](UdfApi.md#shareUDFInfo) | **PATCH** /udf/{namespace}/{name}/share | | -| [**submitGenericUDF**](UdfApi.md#submitGenericUDF) | **POST** /udfs/generic/{namespace} | | -| [**submitMultiArrayUDF**](UdfApi.md#submitMultiArrayUDF) | **POST** /udfs/arrays/{namespace} | | -| [**submitUDF**](UdfApi.md#submitUDF) | **POST** /arrays/{namespace}/{array}/udf/submit | | -| [**udfNamespaceArrayEndTimestampsGet**](UdfApi.md#udfNamespaceArrayEndTimestampsGet) | **GET** /udf/{namespace}/{array}/end_timestamps | | -| [**updateUDFInfo**](UdfApi.md#updateUDFInfo) | **PATCH** /udf/{namespace}/{name} | | +| [**deleteUDFInfo**](UdfApi.md#deleteUDFInfo) | **DELETE** /udf/{workspace}/{name} | | +| [**getUDFInfo**](UdfApi.md#getUDFInfo) | **GET** /udf/{workspace}/{name} | | +| [**getUDFInfoSharingPolicies**](UdfApi.md#getUDFInfoSharingPolicies) | **GET** /udf/{workspace}/{name}/share | | +| [**handleCopyUDF**](UdfApi.md#handleCopyUDF) | **POST** /udf/{workspace}/{name}/copy | | +| [**registerUDFInfo**](UdfApi.md#registerUDFInfo) | **POST** /udf/{workspace}/{name} | | +| [**shareUDFInfo**](UdfApi.md#shareUDFInfo) | **PATCH** /udf/{workspace}/{name}/share | | +| [**submitGenericUDF**](UdfApi.md#submitGenericUDF) | **POST** /udfs/generic/{workspace} | | +| [**submitMultiArrayUDF**](UdfApi.md#submitMultiArrayUDF) | **POST** /udfs/arrays/{workspace} | | +| [**submitUDF**](UdfApi.md#submitUDF) | **POST** /arrays/{workspace}/{teamspace}/{array}/udf/submit | | +| [**udfWorkspaceArrayEndTimestampsGet**](UdfApi.md#udfWorkspaceArrayEndTimestampsGet) | **GET** /udf/{workspace}/{array}/end_timestamps | | +| [**updateUDFInfo**](UdfApi.md#updateUDFInfo) | **PATCH** /udf/{workspace}/{name} | | # **deleteUDFInfo** -> deleteUDFInfo(namespace, name) +> deleteUDFInfo(workspace, name) @@ -52,10 +52,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name to register UDF under try { - apiInstance.deleteUDFInfo(namespace, name); + apiInstance.deleteUDFInfo(workspace, name); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#deleteUDFInfo"); System.err.println("Status code: " + e.getCode()); @@ -71,7 +71,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name to register UDF under | | ### Return type @@ -96,7 +96,7 @@ null (empty response body) # **getUDFInfo** -> UDFInfo getUDFInfo(namespace, name) +> UDFInfo getUDFInfo(workspace, name) @@ -129,10 +129,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name to register UDF under try { - UDFInfo result = apiInstance.getUDFInfo(namespace, name); + UDFInfo result = apiInstance.getUDFInfo(workspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#getUDFInfo"); @@ -149,7 +149,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name to register UDF under | | ### Return type @@ -175,7 +175,7 @@ public class Example { # **getUDFInfoSharingPolicies** -> List<UDFSharing> getUDFInfoSharingPolicies(namespace, name) +> List<UDFSharing> getUDFInfoSharingPolicies(workspace, name) @@ -208,10 +208,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name of UDFInfo try { - List result = apiInstance.getUDFInfoSharingPolicies(namespace, name); + List result = apiInstance.getUDFInfoSharingPolicies(workspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#getUDFInfoSharingPolicies"); @@ -228,7 +228,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name of UDFInfo | | ### Return type @@ -254,7 +254,7 @@ public class Example { # **handleCopyUDF** -> UDFCopied handleCopyUDF(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp) +> UDFCopied handleCopyUDF(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp) @@ -287,13 +287,13 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name of UDFInfo UDFCopy udFCopy = new UDFCopy(); // UDFCopy | Input/Output information to copy a UDF String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = "X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME_example"; // String | Optional registered access credentials to use for creation Integer endTimestamp = 56; // Integer | Milliseconds since Unix epoch try { - UDFCopied result = apiInstance.handleCopyUDF(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); + UDFCopied result = apiInstance.handleCopyUDF(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#handleCopyUDF"); @@ -310,7 +310,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name of UDFInfo | | | **udFCopy** | [**UDFCopy**](UDFCopy.md)| Input/Output information to copy a UDF | | | **X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME** | **String**| Optional registered access credentials to use for creation | [optional] | @@ -338,7 +338,7 @@ public class Example { # **registerUDFInfo** -> registerUDFInfo(namespace, name, udf) +> registerUDFInfo(workspace, name, udf) @@ -371,11 +371,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name to register UDF under UDFInfoUpdate udf = new UDFInfoUpdate(); // UDFInfoUpdate | UDF to register try { - apiInstance.registerUDFInfo(namespace, name, udf); + apiInstance.registerUDFInfo(workspace, name, udf); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#registerUDFInfo"); System.err.println("Status code: " + e.getCode()); @@ -391,7 +391,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name to register UDF under | | | **udf** | [**UDFInfoUpdate**](UDFInfoUpdate.md)| UDF to register | | @@ -417,7 +417,7 @@ null (empty response body) # **shareUDFInfo** -> shareUDFInfo(namespace, name, udfSharing) +> shareUDFInfo(workspace, name, udfSharing) @@ -450,11 +450,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name of UDFInfo UDFSharing udfSharing = new UDFSharing(); // UDFSharing | Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. try { - apiInstance.shareUDFInfo(namespace, name, udfSharing); + apiInstance.shareUDFInfo(workspace, name, udfSharing); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#shareUDFInfo"); System.err.println("Status code: " + e.getCode()); @@ -470,7 +470,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name of UDFInfo | | | **udfSharing** | [**UDFSharing**](UDFSharing.md)| Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. | | @@ -497,7 +497,7 @@ null (empty response body) # **submitGenericUDF** -> File submitGenericUDF(namespace, udf, acceptEncoding) +> File submitGenericUDF(workspace, udf, acceptEncoding) @@ -530,11 +530,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to GenericUDF udf = new GenericUDF(); // GenericUDF | UDF to run String acceptEncoding = "acceptEncoding_example"; // String | Encoding to use try { - File result = apiInstance.submitGenericUDF(namespace, udf, acceptEncoding); + File result = apiInstance.submitGenericUDF(workspace, udf, acceptEncoding); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#submitGenericUDF"); @@ -551,7 +551,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **udf** | [**GenericUDF**](GenericUDF.md)| UDF to run | | | **acceptEncoding** | **String**| Encoding to use | [optional] | @@ -577,7 +577,7 @@ public class Example { # **submitMultiArrayUDF** -> File submitMultiArrayUDF(namespace, udf, acceptEncoding) +> File submitMultiArrayUDF(workspace, udf, acceptEncoding) @@ -610,11 +610,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to MultiArrayUDF udf = new MultiArrayUDF(); // MultiArrayUDF | UDF to run String acceptEncoding = "acceptEncoding_example"; // String | Encoding to use try { - File result = apiInstance.submitMultiArrayUDF(namespace, udf, acceptEncoding); + File result = apiInstance.submitMultiArrayUDF(workspace, udf, acceptEncoding); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#submitMultiArrayUDF"); @@ -631,7 +631,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **udf** | [**MultiArrayUDF**](MultiArrayUDF.md)| UDF to run | | | **acceptEncoding** | **String**| Encoding to use | [optional] | @@ -657,7 +657,7 @@ public class Example { # **submitUDF** -> File submitUDF(namespace, array, udf, xPayer, acceptEncoding, v2) +> File submitUDF(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2) @@ -690,14 +690,15 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded MultiArrayUDF udf = new MultiArrayUDF(); // MultiArrayUDF | UDF to run String xPayer = "xPayer_example"; // String | Name of organization or user who should be charged for this request String acceptEncoding = "acceptEncoding_example"; // String | Encoding to use String v2 = "v2_example"; // String | flag to indicate if v2 array UDFs should be used, currently in beta testing. Setting any value will enable v2 array UDFs. try { - File result = apiInstance.submitUDF(namespace, array, udf, xPayer, acceptEncoding, v2); + File result = apiInstance.submitUDF(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#submitUDF"); @@ -714,7 +715,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **udf** | [**MultiArrayUDF**](MultiArrayUDF.md)| UDF to run | | | **xPayer** | **String**| Name of organization or user who should be charged for this request | [optional] | @@ -741,9 +743,9 @@ public class Example { | **502** | Bad Gateway | - | | **0** | error response | * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
| - -# **udfNamespaceArrayEndTimestampsGet** -> ArrayEndTimestampData udfNamespaceArrayEndTimestampsGet(namespace, array, page, perPage) + +# **udfWorkspaceArrayEndTimestampsGet** +> ArrayEndTimestampData udfWorkspaceArrayEndTimestampsGet(workspace, array, page, perPage) @@ -776,15 +778,15 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String array = "array_example"; // String | name/uri of array that is url-encoded Integer page = 56; // Integer | pagination offset Integer perPage = 56; // Integer | pagination limit try { - ArrayEndTimestampData result = apiInstance.udfNamespaceArrayEndTimestampsGet(namespace, array, page, perPage); + ArrayEndTimestampData result = apiInstance.udfWorkspaceArrayEndTimestampsGet(workspace, array, page, perPage); System.out.println(result); } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#udfNamespaceArrayEndTimestampsGet"); + System.err.println("Exception when calling UdfApi#udfWorkspaceArrayEndTimestampsGet"); System.err.println("Status code: " + e.getCode()); System.err.println("Reason: " + e.getResponseBody()); System.err.println("Response headers: " + e.getResponseHeaders()); @@ -798,7 +800,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **array** | **String**| name/uri of array that is url-encoded | | | **page** | **Integer**| pagination offset | [optional] | | **perPage** | **Integer**| pagination limit | [optional] | @@ -825,7 +827,7 @@ public class Example { # **updateUDFInfo** -> updateUDFInfo(namespace, name, udf) +> updateUDFInfo(workspace, name, udf) @@ -858,11 +860,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UdfApi apiInstance = new UdfApi(defaultClient); - String namespace = "namespace_example"; // String | namespace array is in (an organization name or user's username) + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to String name = "name_example"; // String | name to register UDF under UDFInfoUpdate udf = new UDFInfoUpdate(); // UDFInfoUpdate | UDF to update try { - apiInstance.updateUDFInfo(namespace, name, udf); + apiInstance.updateUDFInfo(workspace, name, udf); } catch (ApiException e) { System.err.println("Exception when calling UdfApi#updateUDFInfo"); System.err.println("Status code: " + e.getCode()); @@ -878,7 +880,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace array is in (an organization name or user's username) | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | | **name** | **String**| name to register UDF under | | | **udf** | [**UDFInfoUpdate**](UDFInfoUpdate.md)| UDF to update | | diff --git a/docs/UserApi.md b/docs/UserApi.md index 35b9dba..898b5c7 100644 --- a/docs/UserApi.md +++ b/docs/UserApi.md @@ -4,13 +4,13 @@ All URIs are relative to */v1* | Method | HTTP request | Description | |------------- | ------------- | -------------| -| [**addAWSAccessCredentials**](UserApi.md#addAWSAccessCredentials) | **POST** /credentials/{namespace}/aws | | +| [**addAWSAccessCredentials**](UserApi.md#addAWSAccessCredentials) | **POST** /credentials/{workspace}/{teamspace}/aws | | | [**addUserToOrganization**](UserApi.md#addUserToOrganization) | **POST** /organizations/{organization}/user | | -| [**checkAWSAccessCredentials**](UserApi.md#checkAWSAccessCredentials) | **GET** /credentials/{namespace}/aws | | -| [**checkAWSAccessCredentialsByName**](UserApi.md#checkAWSAccessCredentialsByName) | **GET** /credentials/{namespace}/aws/{name} | | +| [**checkAWSAccessCredentials**](UserApi.md#checkAWSAccessCredentials) | **GET** /credentials/{workspace}/{teamspace}/aws | | +| [**checkAWSAccessCredentialsByName**](UserApi.md#checkAWSAccessCredentialsByName) | **GET** /credentials/{workspace}/{teamspace}/aws/{name} | | | [**confirmEmail**](UserApi.md#confirmEmail) | **POST** /user/confirm_email | | | [**createUser**](UserApi.md#createUser) | **POST** /user | | -| [**deleteAWSAccessCredentials**](UserApi.md#deleteAWSAccessCredentials) | **DELETE** /credentials/{namespace}/aws/{name} | | +| [**deleteAWSAccessCredentials**](UserApi.md#deleteAWSAccessCredentials) | **DELETE** /credentials/{workspace}/{teamspace}/aws/{name} | | | [**deleteUser**](UserApi.md#deleteUser) | **DELETE** /users/{username} | | | [**deleteUserFromOrganization**](UserApi.md#deleteUserFromOrganization) | **DELETE** /organizations/{organization}/{username} | | | [**getOrganizationUser**](UserApi.md#getOrganizationUser) | **GET** /organizations/{organization}/{username} | | @@ -23,14 +23,14 @@ All URIs are relative to */v1* | [**revokeToken**](UserApi.md#revokeToken) | **DELETE** /tokens/{token} | | | [**tokensGet**](UserApi.md#tokensGet) | **GET** /tokens | | | [**tokensSessionGet**](UserApi.md#tokensSessionGet) | **GET** /tokens/session | | -| [**updateAWSAccessCredentials**](UserApi.md#updateAWSAccessCredentials) | **PATCH** /credentials/{namespace}/aws/{name} | | +| [**updateAWSAccessCredentials**](UserApi.md#updateAWSAccessCredentials) | **PATCH** /credentials/{workspace}/{teamspace}/aws/{name} | | | [**updateUser**](UserApi.md#updateUser) | **PATCH** /users/{username} | | | [**updateUserInOrganization**](UserApi.md#updateUserInOrganization) | **PATCH** /organizations/{organization}/{username} | | # **addAWSAccessCredentials** -> addAWSAccessCredentials(namespace, awsAccessCredentials) +> addAWSAccessCredentials(workspace, teamspace, awsAccessCredentials) @@ -63,10 +63,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to AWSAccessCredentials awsAccessCredentials = new AWSAccessCredentials(); // AWSAccessCredentials | aws access credentials to store for a namespace try { - apiInstance.addAWSAccessCredentials(namespace, awsAccessCredentials); + apiInstance.addAWSAccessCredentials(workspace, teamspace, awsAccessCredentials); } catch (ApiException e) { System.err.println("Exception when calling UserApi#addAWSAccessCredentials"); System.err.println("Status code: " + e.getCode()); @@ -82,7 +83,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **awsAccessCredentials** | [**AWSAccessCredentials**](AWSAccessCredentials.md)| aws access credentials to store for a namespace | | ### Return type @@ -184,7 +186,7 @@ null (empty response body) # **checkAWSAccessCredentials** -> List<AWSAccessCredentials> checkAWSAccessCredentials(namespace) +> List<AWSAccessCredentials> checkAWSAccessCredentials(workspace, teamspace) @@ -217,9 +219,10 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to try { - List result = apiInstance.checkAWSAccessCredentials(namespace); + List result = apiInstance.checkAWSAccessCredentials(workspace, teamspace); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UserApi#checkAWSAccessCredentials"); @@ -236,7 +239,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | ### Return type @@ -260,7 +264,7 @@ public class Example { # **checkAWSAccessCredentialsByName** -> AWSAccessCredentials checkAWSAccessCredentialsByName(namespace, name) +> AWSAccessCredentials checkAWSAccessCredentialsByName(workspace, teamspace, name) @@ -293,10 +297,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to String name = "name_example"; // String | name try { - AWSAccessCredentials result = apiInstance.checkAWSAccessCredentialsByName(namespace, name); + AWSAccessCredentials result = apiInstance.checkAWSAccessCredentialsByName(workspace, teamspace, name); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UserApi#checkAWSAccessCredentialsByName"); @@ -313,7 +318,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **name** | **String**| name | | ### Return type @@ -472,7 +478,7 @@ No authorization required # **deleteAWSAccessCredentials** -> deleteAWSAccessCredentials(namespace, name) +> deleteAWSAccessCredentials(workspace, teamspace, name) @@ -505,10 +511,11 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to String name = "name_example"; // String | name try { - apiInstance.deleteAWSAccessCredentials(namespace, name); + apiInstance.deleteAWSAccessCredentials(workspace, teamspace, name); } catch (ApiException e) { System.err.println("Exception when calling UserApi#deleteAWSAccessCredentials"); System.err.println("Status code: " + e.getCode()); @@ -524,7 +531,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **name** | **String**| name | | ### Return type @@ -780,7 +788,7 @@ public class Example { # **getSession** -> Token getSession(rememberMe) +> Token getSession(rememberMe, expires) @@ -814,8 +822,9 @@ public class Example { UserApi apiInstance = new UserApi(defaultClient); String rememberMe = "rememberMe_example"; // String | flag to create a token with expiration of 30 days, default is false + OffsetDateTime expires = OffsetDateTime.now(); // OffsetDateTime | Expiration date for token, if empty token defaults to 30 minutes try { - Token result = apiInstance.getSession(rememberMe); + Token result = apiInstance.getSession(rememberMe, expires); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling UserApi#getSession"); @@ -833,6 +842,7 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| | **rememberMe** | **String**| flag to create a token with expiration of 30 days, default is false | [optional] | +| **expires** | **OffsetDateTime**| Expiration date for token, if empty token defaults to 30 minutes | [optional] | ### Return type @@ -1448,7 +1458,7 @@ This endpoint does not need any parameter. # **updateAWSAccessCredentials** -> updateAWSAccessCredentials(namespace, name, awsAccessCredentials) +> updateAWSAccessCredentials(workspace, teamspace, name, awsAccessCredentials) @@ -1481,11 +1491,12 @@ public class Example { //ApiKeyAuth.setApiKeyPrefix("Token"); UserApi apiInstance = new UserApi(defaultClient); - String namespace = "namespace_example"; // String | namespace + String workspace = "workspace_example"; // String | the workspace containing the teamspace the array belongs to + String teamspace = "teamspace_example"; // String | the teamspace the credentials belongs to String name = "name_example"; // String | name AWSAccessCredentials awsAccessCredentials = new AWSAccessCredentials(); // AWSAccessCredentials | aws credentials to update try { - apiInstance.updateAWSAccessCredentials(namespace, name, awsAccessCredentials); + apiInstance.updateAWSAccessCredentials(workspace, teamspace, name, awsAccessCredentials); } catch (ApiException e) { System.err.println("Exception when calling UserApi#updateAWSAccessCredentials"); System.err.println("Status code: " + e.getCode()); @@ -1501,7 +1512,8 @@ public class Example { | Name | Type | Description | Notes | |------------- | ------------- | ------------- | -------------| -| **namespace** | **String**| namespace | | +| **workspace** | **String**| the workspace containing the teamspace the array belongs to | | +| **teamspace** | **String**| the teamspace the credentials belongs to | | | **name** | **String**| name | | | **awsAccessCredentials** | [**AWSAccessCredentials**](AWSAccessCredentials.md)| aws credentials to update | | diff --git a/openapi-v1.yaml b/openapi-v1.yaml index c764327..d431c99 100644 --- a/openapi-v1.yaml +++ b/openapi-v1.yaml @@ -2,7 +2,7 @@ swagger: "2.0" info: description: TileDB Storage Platform REST API title: TileDB Storage Platform API - version: 2.2.19 + version: 2.17.51 produces: - application/json @@ -89,6 +89,54 @@ definitions: - STRING_UCS4 # This can be any datatype. Must store (type tag, value) pairs. - ANY + # Datetime with year resolution + - DATETIME_YEAR + # Datetime with month resolution + - DATETIME_MONTH + # Datetime with week resolution + - DATETIME_WEEK + # Datetime with day resolution + - DATETIME_DAY + # Datetime with hour resolution + - DATETIME_HR + # Datetime with minute resolution + - DATETIME_MIN + # Datetime with second resolution + - DATETIME_SEC + # Datetime with millisecond resolution + - DATETIME_MS + # Datetime with microsecond resolution + - DATETIME_US + # Datetime with nanosecond resolution + - DATETIME_NS + # Datetime with picosecond resolution + - DATETIME_PS + # Datetime with femtosecond resolution + - DATETIME_FS + # Datetime with attosecond resolution + - DATETIME_AS + # Time with hour resolution + - TIME_HR + # Time with minute resolution + - TIME_MIN + # Time with second resolution + - TIME_SEC + # Time with millisecond resolution + - TIME_MS + # Time with microsecond resolution + - TIME_US + # Time with nanosecond resolution + - TIME_NS + # Time with picosecond resolution + - TIME_PS + # Time with femtosecond resolution + - TIME_FS + # Time with attosecond resolution + - TIME_AS + # 8-bit unsigned integer + - BLOB + # Boolean + - BOOL ActivityEventType: description: Type of activity logged @@ -124,7 +172,10 @@ definitions: - estimated_result_sizes # read_fragment_info - read_fragment_info - + # read_enumerations + - read_enumerations + # nextflow + - nextflow UDFLanguage: description: UDF Type type: string @@ -246,6 +297,8 @@ definitions: - owner # Admin almost all rights but can't delete organization - admin + # Read, write, and delete User + - read_write_delete # Read and write User - read_write # Read Only User @@ -625,6 +678,7 @@ definitions: package: "github.com/TileDB-Inc/TileDB-Go" alias: "tiledb" type: "ArraySchema" + embedded: true AttributeBufferHeader: description: Represents an attribute buffer header information @@ -913,6 +967,24 @@ definitions: items: $ref: "#/definitions/ArrayMetadataEntry" + MetadataStringifiedEntry: + type: object + description: key/value pair representing an asset metadata map entry + properties: + key: + description: The metadata key + type: string + x-omitempty: false + value: + description: The metadata value + type: string + x-omitempty: false + type: + description: The metadata type + type: string + x-omitempty: false + example: array_metadata + TileDBConfig: description: TileDB config used for interaction with the embedded library type: object @@ -1068,6 +1140,7 @@ definitions: description: Start time RFC3339 for job type: string format: date-time + x-nullable: true finish_time: description: Finish time RFC3339 for job type: string @@ -1141,6 +1214,14 @@ definitions: x-omitempty: true description: > If set, the client-defined ID of the node within this task's graph. + cloud_provider: + type: string + x-omitempty: true + description: The name of the cloud provider where this task executed. + cloud_region: + type: string + x-omitempty: true + description: The region of the cloud provider where this task executed. PaginationMetadata: properties: @@ -1391,6 +1472,11 @@ definitions: default_namespace_charged: description: Override the default namespace charged for actions when no namespace is specified type: string + default_region: + description: > + The default region to use for notebooks and other operations. It must be a region supported by TileDB, + see https://docs.tiledb.com/cloud/concepts/tiledb-cloud-internals/architecture#orchestration + type: string OrganizationUser: description: user in an organization @@ -1408,6 +1494,14 @@ definitions: description: username for user type: string example: "username" + user_full_name: + description: full name of the user; available to organization admins + type: string + example: "Alice Hanna" + user_email: + description: email address of the user; available to organization admins + type: string + example: alice@example.com organization_name: description: name of organization type: string @@ -1606,6 +1700,47 @@ definitions: type: boolean readOnly: true example: false + assume_role_arn: + description: > + A AWS Role that will be first assumed before assuming the organization's AWS Role. + Visible to owners and admins. + type: string + x-omitempty: true + + OrganizationUpdate: + description: OrganizationUpdate + type: object + properties: + name: + type: string + minLength: 1 + maxLength: 63 + pattern: "^[\\w.\\-]+$" # only allows alphanumeric characters + description: organization name must be unique + x-nullable: true + logo: + description: Organization logo + type: string + x-nullable: true + description: + description: Organization description + type: string + x-nullable: true + default_s3_path: + description: > + The default location to store newly-created notebooks and other assets + like UDFs. The name `default_s3_path` is a legacy holdover; it may + refer to any supported storage location. + type: string + x-nullable: true + default_s3_path_credentials_name: + description: > + The name of the credentials used to create and access files in the + `default_s3_path`, if needed. + type: string + x-nullable: true + asset_locations: + $ref: "#/definitions/AssetLocations" AssetLocations: description: > @@ -1743,7 +1878,7 @@ definitions: # Raster - raster # Vector search - - vector_search + - vector_search FilePropertyName: description: File property assigned to a specific file (array) @@ -1884,6 +2019,10 @@ definitions: description: unique ID of registered array type: string example: "00000000-0000-0000-0000-000000000000" + asset_id: + type: string + description: The asset id of the created array + x-omitempty: false file_type: description: File type stored /wrapped by this array x-omitempty: true @@ -1992,6 +2131,22 @@ definitions: type: boolean x-omitempty: true example: true + created_at: + description: Datetime array was registered with tiledb + type: string + format: date-time + created_by: + description: The user who created the array, if known. + type: string + x-omitempty: true + metadata: + description: | + Contains the metadata of the array. + **Note:** This property is included in the response only if the `with_metadata` query parameter is set to `true`. + type: array + x-omitempty: true + items: + $ref: "#/definitions/MetadataStringifiedEntry" ArrayInfoUpdate: description: metadata of an array @@ -2140,6 +2295,10 @@ definitions: - stripe # Okta - okta + # perdomain + - perdomain + # SCIM + - scim PublicShareFilter: description: Query parameter to get array metadatas @@ -2708,12 +2867,28 @@ definitions: format: uint64 example: 4000 cost: - description: cost in USD for the current notebook session + description: cost in USD for the current notebook session x-omitempty: true x-nullable: true type: number format: double example: 0.27 + pod_status: + description: Status of the pod + $ref: "#/definitions/PodStatus" + example: RUNNING + x-omitempty: true + + PodStatus: + description: List of all available pod statuses + type: string + enum: + # Terminating + - TERMINATING + # Running + - RUNNING + # Launching + - LAUNCHING ArrayFavorite: description: A user-favorite array item @@ -2833,6 +3008,8 @@ definitions: - GROUP_SHARE # Join Organization - JOIN_ORGANIZATION + # Allow a child namespace to use a payment instrument + - PAYMENT_SHARE InvitationStatus: description: List of values that InvitationStatus can take @@ -3089,6 +3266,7 @@ definitions: type: object required: - id + - asset_id properties: output_uri: type: string @@ -3096,6 +3274,10 @@ definitions: file_name: type: string description: name of the file uploaded + asset_id: + type: string + description: The asset id of the created Group + x-omitempty: false id: description: unique ID of the uploaded file type: string @@ -3316,6 +3498,22 @@ definitions: type: string x-omitempty: true description: License text + created_at: + description: Datetime the group was registered with tiledb + type: string + format: date-time + created_by: + description: The username of the group's creator, if known. + type: string + x-omitempty: true + metadata: + description: | + Contains metadata of the group. + **Note:** This property is included in the response only if the `with_metadata` query parameter is set to `true`. + type: array + x-omitempty: true + items: + $ref: "#/definitions/MetadataStringifiedEntry" GroupEntry: description: Object describing a single member of a group, which can be an array or a group @@ -3625,7 +3823,7 @@ definitions: type: string example: "MyOrganization" - GroupActivity: + GroupContentActivity: description: Object containing activity of an asset of a group type: object properties: @@ -3649,7 +3847,7 @@ definitions: description: Object containing the activity log $ref: "#/definitions/ArrayActivityLog" - GroupActivityResponse: + GroupContentActivityResponse: description: Object containing activity logs of group content along with the pagination metadata type: object properties: @@ -3659,7 +3857,7 @@ definitions: x-omitempty: false x-nullable: false items: - $ref: "#/definitions/GroupActivity" + $ref: "#/definitions/GroupContentActivity" pagination_metadata: x-omitempty: false x-nullable: false @@ -3719,6 +3917,7 @@ definitions: enum: - batch - realtime + - nextflow TaskGraphLog: description: Logging information about the execution of a task graph. @@ -3815,6 +4014,28 @@ definitions: task_graph_id: type: string description: The UUID of the task graph. + cloud_provider: + type: string + x-omitempty: true + description: The name of the cloud provider where this task graph executed. + cloud_region: + type: string + x-omitempty: true + description: The region of the cloud provider where this task graph executed. + root_task_graph_uuid: + type: string + x-omitempty: true + description: > + The UUID of the root taskgraph that this taskgraph is related to. + This is used to provide consistent tracking and UI view for graphs that + are executed by a set of taskgraphs. + children_task_graph_uuids: + description: > + If this is a root taskgraph, this contains the list of all its children + taskgraph UUIDs. + type: array + items: + type: string TaskGraphNodeMetadata: description: Metadata about an individual node in a task graph. @@ -3825,6 +4046,7 @@ definitions: description: The client-generated UUID of the given graph node. name: type: string + maxLength: 255 description: > The client-generated name of the node. This is not guaranteed to be unique. @@ -3908,6 +4130,7 @@ definitions: description: The name of the user who created this task graph log. name: type: string + maxLength: 255 description: > A name for this task graph, displayed in the UI. Does not need to be unique. @@ -3923,7 +4146,7 @@ definitions: $ref: "#/definitions/TaskGraphNode" description: > The structure of the graph. This is provided by the client - when first setting up the task graph. + when first setting up the task graph. This must be topographically sorted; that is, each node must appear after all nodes that it depends upon. parallelism: @@ -3943,7 +4166,7 @@ definitions: x-omitempty: true description: > Duration in seconds relative to the workflow start time which the - workflow is allowed to run before it gets terminated. + workflow is allowed to run before it gets terminated. Defaults to 24h when unset task_graph_type: $ref: "#/definitions/TaskGraphType" @@ -3974,6 +4197,7 @@ definitions: description: The namespace that owns this task graph log. name: type: string + maxLength: 255 description: > The name of this graph, to appear in URLs. Must be unique per-namespace. @@ -4049,6 +4273,7 @@ definitions: description: The client-generated UUID of the given graph node. name: type: string + maxLength: 255 x-nullable: true description: > A client-specified name for the node. If provided, this must be @@ -4363,8 +4588,8 @@ definitions: resources: type: object description: > - The resources requested for this particular node. If resources are not - specified resource_class is used, if it is not set the standard resource + The resources requested for this particular node. If resources are not + specified resource_class is used, if it is not set the standard resource // defaults are used properties: cpu: @@ -4393,6 +4618,38 @@ definitions: allowed to run indefinitely (subject to the server’s global limits). type: number x-nullable: true + storage: + description: > + Storage options for mounting persistent volumes. + type: array + x-omitempty: true + items: + $ref: "#/definitions/TGUDFStorage" + + TGUDFStorage: + description: Storage options for mounting persistent volumes. + type: object + properties: + path: + description: > + Mount path for the attached volume. + type: string + tiledb_uri: + description: > + TileDB filesystem to mount + type: string + example: tiledb:/// + size: + description: > + Storage size. + type: string + example: 8Gi + storage_class: + description: > + Storage class to use for creating the volume. + type: string + example: gp2 + FragmentMetadata: description: Fragment Metadata @@ -4591,6 +4848,12 @@ definitions: type: object description: config to use to retrieve the contents $ref: "#/definitions/TileDBConfig" + fragments: + description: list of fragments in the array to consolidate + type: array + x-omitempty: true + items: + type: string ArrayVacuumRequest: description: Request to consolidate an array @@ -4601,6 +4864,75 @@ definitions: description: config to use to retrieve the contents $ref: "#/definitions/TileDBConfig" + Enumeration: + description: The enumerations of a single attribute + type: object + properties: + name: + type: string + path_name: + type: string + type: + type: string + cell_val_num: + type: integer + format: uint32 + ordered: + type: boolean + data: + type: array + items: + type: integer + format: uint8 + offsets: + type: array + items: + type: integer + format: uint8 + + LoadEnumerationsRequest: + description: Request to return enumerations for attributes + type: object + properties: + config: + type: object + description: config to use to retrieve the contents + $ref: "#/definitions/TileDBConfig" + enumerations: + type: array + items: + type: string + + LoadEnumerationsResponse: + description: Contains the enumerations of the array's attributes + type: object + properties: + enumerations: + type: array + items: + $ref: '#/definitions/Enumeration' + + LoadArraySchemaRequest: + description: Request to load an array schema + type: object + properties: + config: + type: object + description: config to use to retrieve the contents + $ref: "#/definitions/TileDBConfig" + + LoadArraySchemaResponse: + description: Contains the latest schema and all schemas for the opened array + type: object + properties: + latest_array_schema: + $ref: "#/definitions/ArraySchema" + all_array_schemas: + description: map of all array schemas + type: object + additionalProperties: + $ref: "#/definitions/ArraySchema" + RetryStrategy: description: RetryStrategy provides controls on how to retry a taskgraph node type: object @@ -4647,6 +4979,108 @@ definitions: # Retry task transient errors - OnTransientError + AssetBackingType: + description: The technology that an asset is backed by + type: string + enum: + # Array + - array + # Groups + - group + + AssetOwnershipLevel: + description: The ownership level of the asset + type: string + enum: + # Owned + - owned + # Shared + - shared + + MetadataStringified: + type: object + description: The user's TileDB metadata + properties: + entries: + description: List of metadata entries + type: array + x-omitempty: true + items: + $ref: "#/definitions/MetadataStringifiedEntry" + + AssetInfo: + description: metadata of an asset + type: object + properties: + uuid: + description: unique ID of a registered asset + type: string + example: "00000000-0000-0000-0000-000000000000" + asset_type: + description: Asset type of an asset + $ref: "#/definitions/AssetType" + asset_backing_type: + description: Asset type of an asset + $ref: "#/definitions/AssetBackingType" + asset_ownership_level: + description: Ownership level of the asset + $ref: "#/definitions/AssetOwnershipLevel" + namespace_name: + description: namespace_name that the asset is registered to + type: string + example: "user1" + namespace_uuid: + description: namespace_uuid that the asset is registered to + type: string + example: "00000000-0000-0000-0000-000000000000" + name: + description: name of asset + type: string + example: myarray1 + mime_type: + description: mime type of the asset + type: string + example: application/vnd.tiledb.v1.array + created_at: + description: "Time when the asset was created (rfc3339)" + type: string + format: date-time + readOnly: true + metadata: + description: metadata for the asset, only included when expanded + $ref: "#/definitions/MetadataStringified" + + AssetListResponse: + description: Asset associated with a TileDB Cloud account + type: object + properties: + data: + description: asset information for each asset + type: array + x-omitempty: true + items: + $ref: "#/definitions/AssetInfo" + pagination_metadata: + $ref: "#/definitions/PaginationMetadata" + + ChangeAssetCredentialsRequest: + description: Request body to change the credentials of the given assets + type: object + required: + - access_credentials + - asset_uuids + properties: + access_credentials: + description: The name or uuid of the access credentials + type: string + x-nullable: false + asset_uuids: + description: The list of asset uuids to have their credentials changed + type: array + items: + type: string + x-nullable: false + paths: /.stats: get: @@ -4700,13 +5134,23 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}: + /arrays/{workspace}/{teamspace}: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true + - name: with_metadata + in: query + description: include the metadata of the arrays + type: boolean + required: false get: description: get metadata on all arrays in a namespace tags: @@ -4727,11 +5171,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}: + /arrays/{workspace}/{teamspace}/{array}: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -4808,11 +5257,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/activity: + /arrays/{workspace}/{teamspace}/{array}/activity: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -4864,11 +5318,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/activity/{id}: + /arrays/{workspace}/{teamspace}/{array}/activity/{id}: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -4898,11 +5357,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/deregister: + /arrays/{workspace}/{teamspace}/{array}/deregister: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -4925,11 +5389,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/array_metadata: + /arrays/{workspace}/{teamspace}/{array}/array_metadata: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -4987,11 +5456,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/fragment_info: + /arrays/{workspace}/{teamspace}/{array}/fragment_info: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5027,11 +5501,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/metadata: + /arrays/{workspace}/{teamspace}/{array}/metadata: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5077,11 +5556,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/fragment_end_timestamp: + /arrays/{workspace}/{teamspace}/{array}/fragment_end_timestamp: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5114,16 +5598,21 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/register: + /arrays/{workspace}/{teamspace}/{array}/register: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array in: path - description: name/uri of array that is url-encoded + description: asset id or path of array that is url-encoded type: string required: true post: @@ -5150,11 +5639,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/consolidate: + /arrays/{workspace}/{teamspace}/{array}/consolidate: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5184,11 +5678,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/vacuum: + /arrays/{workspace}/{teamspace}/{array}/vacuum: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5218,11 +5717,102 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/share: + /arrays/{workspace}/{teamspace}/{array}/enumerations: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string + required: true + - name: array + in: path + description: name/uri of array that is url-encoded + type: string + required: true + post: + description: request to get the enumerations of the arrays' attributes + tags: + - array + operationId: loadEnumerations + parameters: + - name: load_enumerations_request + in: body + description: Load Enumerations Request + schema: + $ref: "#/definitions/LoadEnumerationsRequest" + required: true + responses: + 200: + description: enumerations returned successfully + schema: + $ref: "#/definitions/LoadEnumerationsResponse" + 404: + description: Array does not exist or user does not have permissions to access it + 502: + description: Bad Gateway + default: + description: error response + schema: + $ref: "#/definitions/Error" + + /arrays/{workspace}/{teamspace}/{array}/schema: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string + required: true + - name: array + in: path + description: name/uri of array that is url-encoded + type: string + required: true + post: + description: request to get the array schema + tags: + - array + operationId: loadArraySchema + parameters: + - name: load_array_schema_request + in: body + description: Load Array Schema Request + schema: + $ref: "#/definitions/LoadArraySchemaRequest" + required: true + responses: + 200: + description: array schemas returned successfully + schema: + $ref: "#/definitions/LoadArraySchemaResponse" + 404: + description: Array does not exist or user does not have permissions to access it + 502: + description: Bad Gateway + default: + description: error response + schema: + $ref: "#/definitions/Error" + + /arrays/{workspace}/{teamspace}/{array}/share: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5275,11 +5865,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/non_empty_domain: + /arrays/{workspace}/{teamspace}/{array}/non_empty_domain: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5314,11 +5909,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/max_buffer_sizes: + /arrays/{workspace}/{teamspace}/{array}/max_buffer_sizes: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5358,11 +5958,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/udf/submit: + /arrays/{workspace}/{teamspace}/{array}/udf/submit: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5421,11 +6026,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/query/submit: + /arrays/{workspace}/{teamspace}/{array}/query/submit: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5489,11 +6099,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/query/submit_query_json: + /arrays/{workspace}/{teamspace}/{array}/query/submit_query_json: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5547,11 +6162,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/query/get_file: + /arrays/{workspace}/{teamspace}/{array}/query/get_file: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5597,11 +6217,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/query/finalize: + /arrays/{workspace}/{teamspace}/{array}/query/finalize: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -5665,11 +6290,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/query/est_result_sizes: + /arrays/{workspace}/{teamspace}/{array}/query/est_result_sizes: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5733,11 +6363,16 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/{namespace}/{array}/sample: + /arrays/{workspace}/{teamspace}/{array}/sample: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5798,11 +6433,16 @@ paths: message: "Error try again" code: 1 - /arrays/{namespace}/{array}/metadata_json: + /arrays/{workspace}/{teamspace}/{array}/metadata_json: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5857,11 +6497,16 @@ paths: message: "Error try again" code: 1 - /arrays/{namespace}/{array}/non_empty_domain_json: + /arrays/{workspace}/{teamspace}/{array}/non_empty_domain_json: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -5898,11 +6543,16 @@ paths: message: "Error try again" code: 1 - /arrays/{namespace}/{array}/end_timestamps: + /arrays/{workspace}/{teamspace}/{array}/end_timestamps: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -6113,13 +6763,18 @@ paths: schema: $ref: "#/definitions/Error" - /credentials/{namespace}/aws: + /credentials/{workspace}/{teamspace}/aws: parameters: - - name: namespace + - name: workspace in: path - description: namespace + description: the workspace containing the teamspace the array belongs to + type: string required: true + - name: teamspace + in: path + description: the teamspace the credentials belongs to type: string + required: true get: tags: - user @@ -6162,13 +6817,18 @@ paths: schema: $ref: "#/definitions/Error" - /credentials/{namespace}/aws/{name}: + /credentials/{workspace}/{teamspace}/aws/{name}: parameters: - - name: namespace + - name: workspace in: path - description: namespace + description: the workspace containing the teamspace the array belongs to + type: string required: true + - name: teamspace + in: path + description: the teamspace the credentials belongs to type: string + required: true - name: name in: path description: name @@ -6326,7 +6986,7 @@ paths: in: body description: organization details to update schema: - $ref: "#/definitions/Organization" + $ref: "#/definitions/OrganizationUpdate" required: true responses: 204: @@ -6588,6 +7248,12 @@ paths: description: flag to create a token with expiration of 30 days, default is false type: string required: false + - name: expires + in: query + description: Expiration date for token, if empty token defaults to 30 minutes + type: string + format: date-time + required: false get: tags: - user @@ -6918,11 +7584,16 @@ paths: schema: $ref: "#/definitions/Error" - /sql/{namespace}: + /sql/{workspace}/{teamspace}: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace to run task under is in (an organization name or user's username) + description: the teamspace the sql query belongs to type: string required: true - name: Accept-Encoding @@ -6967,11 +7638,11 @@ paths: schema: $ref: "#/definitions/Error" - /udfs/generic/{namespace}: + /udfs/generic/{workspace}: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to type: string required: true - name: Accept-Encoding @@ -7016,11 +7687,11 @@ paths: schema: $ref: "#/definitions/Error" - /udfs/arrays/{namespace}: + /udfs/arrays/{workspace}: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to type: string required: true - name: Accept-Encoding @@ -7065,11 +7736,11 @@ paths: schema: $ref: "#/definitions/Error" - /udf/{namespace}/{name}: + /udf/{workspace}/{name}: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to type: string required: true - name: name @@ -7152,11 +7823,11 @@ paths: schema: $ref: "#/definitions/Error" - /udf/{namespace}/{name}/share: + /udf/{workspace}/{name}/share: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to type: string required: true - name: name @@ -7209,11 +7880,11 @@ paths: schema: $ref: "#/definitions/Error" - /udf/{namespace}/{name}/copy: + /udf/{workspace}/{name}/copy: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to type: string required: true - name: name @@ -7256,11 +7927,11 @@ paths: schema: $ref: "#/definitions/Error" - /udf/{namespace}/{array}/end_timestamps: + /udf/{workspace}/{array}/end_timestamps: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to type: string required: true - name: array @@ -7296,11 +7967,16 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/server/{namespace}/status: + /notebooks/server/{workspace}/{teamspace}/status: parameters: - - name: namespace + - name: workspace in: path - description: namespace notebook is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true get: @@ -7313,8 +7989,6 @@ paths: description: status of running notebook schema: $ref: "#/definitions/NotebookStatus" - 202: - description: Notebook server is pending 402: description: Payment required schema: @@ -7328,11 +8002,16 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/server/{namespace}: + /notebooks/server/{workspace}/{teamspace}: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace notebook is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true delete: @@ -7352,11 +8031,16 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/{namespace}/{array}/rename: + /notebooks/{workspace}/{teamspace}/{array}/rename: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -7386,13 +8070,18 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/{namespace}/{array}/copy: + /notebooks/{workspace}/{teamspace}/{array}/copy: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the notebook - type: string name: array in: path @@ -7432,13 +8121,18 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/{namespace}/upload: + /notebooks/{workspace}/{teamspace}/upload: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the notebook - name: X-TILEDB-CLOUD-ACCESS-CREDENTIALS-NAME in: header description: Optional registered access credentials to use for creation @@ -7477,11 +8171,16 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/{namespace}/{array}/end_timestamps: + /notebooks/{workspace}/{teamspace}/{array}/end_timestamps: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -7517,11 +8216,16 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/{namespace}/{array}/prune: + /notebooks/{workspace}/{teamspace}/{array}/prune: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: array @@ -7644,11 +8348,16 @@ paths: schema: $ref: "#/definitions/Error" - /invitations/{invitation}/{namespace}/{array}/share: + /invitations/{invitation}/{workspace}/{teamspace}/{array}/share: parameters: - - name: namespace + - name: workspace in: path - description: namespace array is in (an organization name or user's username) + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to type: string required: true - name: invitation @@ -7678,11 +8387,16 @@ paths: schema: $ref: "#/definitions/Error" - /invitations/group/{invitation}/{namespace}/{group_name}/share: + /invitations/group/{invitation}/{workspace}/{teamspace}/{group_name}/share: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace group is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: invitation @@ -7741,11 +8455,16 @@ paths: schema: $ref: "#/definitions/Error" - /invitations/{namespace}/{array}/share: + /invitations/{workspace}/{teamspace}/{array}/share: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace array is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: array @@ -7783,11 +8502,16 @@ paths: schema: $ref: "#/definitions/Error" - /invitations/group/{namespace}/{group}/share: + /invitations/group/{workspace}/{teamspace}/{group}/share: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path - description: namespace group is in (an organization name or user's username) + description: the teamspace the array belongs to type: string required: true - name: group @@ -7862,6 +8586,88 @@ paths: schema: $ref: "#/definitions/Error" + /invitations/share_payment/{workspace}/{teamspace}: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string + required: true + post: + tags: + - invitation + description: | + Sends email to multiple recipients allowing them to use the payment + instrument provided by the source namespace. + operationId: sharePayment + parameters: + - name: email_invite + in: body + description: | + Recipients of the invitation. These may only be namespaces, + not email addresses. + schema: + type: object + properties: + namespaces: + type: array + items: + type: string + responses: + 204: + description: Email sent successfully to user for email confirmation link + 207: + description: Only a portion of the invitations succeeded, some failed + schema: + $ref: "#/definitions/InvitationFailedRecipients" + 500: + description: Could not reach any recipients + schema: + $ref: "#/definitions/InvitationFailedRecipients" + 502: + description: Bad Gateway + default: + description: error response + schema: + $ref: "#/definitions/Error" + + /invitations/share_payment/{workspace}/{teamspace}/{target}: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string + required: true + - name: target + in: path + description: name or UUID of recipient namespace + type: string + required: true + delete: + tags: + - invitation + description: Revokes invitation from the source namespace to the target. + operationId: cancelSharePayment + responses: + 204: + description: Invitation cancelled successfully + 404: + description: No invitation was found to cancel + default: + description: error response + schema: + $ref: "#/definitions/Error" + /arrays/browser/shared: parameters: - name: page @@ -7886,7 +8692,7 @@ paths: type: string - name: orderby in: query - description: sort by which field valid values include last_accessed, size, name + description: sort by which field valid values include size, name required: false type: string - name: permissions @@ -7942,6 +8748,11 @@ paths: collectionFormat: multi items: type: string + - name: with_metadata + in: query + description: include the metadata of the array + type: boolean + required: false get: tags: - array @@ -8032,7 +8843,7 @@ paths: type: string - name: orderby in: query - description: sort by which field valid values include last_accessed, size, name + description: sort by which field valid values include size, name required: false type: string - name: permissions @@ -8080,6 +8891,11 @@ paths: collectionFormat: multi items: type: string + - name: with_metadata + in: query + description: include the metadata of the array + type: boolean + required: false get: tags: - array @@ -8162,7 +8978,7 @@ paths: type: string - name: orderby in: query - description: sort by which field valid values include last_accessed, size, name + description: sort by which field valid values include size, name required: false type: string - name: permissions @@ -8210,6 +9026,11 @@ paths: collectionFormat: multi items: type: string + - name: with_metadata + in: query + description: include the metadata of the array + type: boolean + required: false get: tags: - array @@ -8318,13 +9139,18 @@ paths: schema: $ref: "#/definitions/Error" - /arrays/favorites/{namespace}/{name}: + /arrays/favorites/{workspace}/{teamspace}/{name}: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the array - type: string name: name in: path @@ -8430,13 +9256,18 @@ paths: schema: $ref: "#/definitions/Error" - /notebooks/favorites/{namespace}/{name}: + /notebooks/favorites/{workspace}/{teamspace}/{name}: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the notebook - type: string name: name in: path @@ -8537,13 +9368,18 @@ paths: schema: $ref: "#/definitions/Error" - /ml_models/favorites/{namespace}/{name}: + /ml_models/favorites/{workspace}/{teamspace}/{name}: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the ML model - type: string name: name in: path @@ -8644,13 +9480,13 @@ paths: schema: $ref: "#/definitions/Error" - /udfs/favorites/{namespace}/{name}: + /udfs/favorites/{workspace}/{name}: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string required: true - description: The namespace of the UDF - type: string name: name in: path @@ -8701,13 +9537,18 @@ paths: schema: $ref: "#/definitions/Error" - /files/{namespace}: + /files/{workspace}/{teamspace}: parameters: - - type: string - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the file - name: FileCreate in: body description: Input/Output information to create a new TileDB file @@ -8736,13 +9577,18 @@ paths: schema: $ref: "#/definitions/Error" - /files/{namespace}/upload: + /files/{workspace}/{teamspace}/upload: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the file - name: X-TILEDB-CLOUD-ACCESS-CREDENTIALS-NAME in: header description: Optional registered access credentials to use for creation @@ -8781,13 +9627,18 @@ paths: schema: $ref: "#/definitions/Error" - /files/{namespace}/{file}/export: + /files/{workspace}/{teamspace}/{file}/export: parameters: - - type: string - name: namespace + - name: workspace in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the file - type: string name: file in: path @@ -8906,6 +9757,11 @@ paths: description: search only the children of the groups with this uuid type: string required: false + - name: with_metadata + in: query + description: include the metadata of the groups + type: boolean + required: false responses: 200: description: the group contents @@ -9016,6 +9872,11 @@ paths: collectionFormat: multi items: type: string + - name: with_metadata + in: query + description: include the metadata of the groups + type: boolean + required: false responses: 200: description: the group contents @@ -9112,6 +9973,11 @@ paths: description: search only the children of the groups with this uuid type: string required: false + - name: with_metadata + in: query + description: include the metadata of the groups + type: boolean + required: false responses: 200: description: the group contents @@ -9124,13 +9990,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{group_namespace}/{group_name}/contents/filters: + /groups/{workspace}/{teamspace}/{group_name}/contents/filters: parameters: - - name: group_namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group - name: group_name type: string in: path @@ -9152,13 +10023,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{group_namespace}/{group_name}/contents: + /groups/{workspace}/{teamspace}/{group_name}/contents: parameters: - - name: group_namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group - name: group_name type: string in: path @@ -9258,13 +10134,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{namespace}/{array}/register: + /groups/{workspace}/{teamspace}/{array}/register: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group - name: array type: string in: path @@ -9290,13 +10171,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{namespace}/create: + /groups/{workspace}/{teamspace}/create: parameters: - - name: namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group post: description: Creates a new group in the namespace. operationId: createGroup @@ -9317,13 +10203,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{group_namespace}/{group_name}/share: + /groups/{workspace}/{teamspace}/{group_name}/share: parameters: - - name: group_namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group - name: group_name type: string in: path @@ -9374,13 +10265,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{group_namespace}/{group_name}: + /groups/{workspace}/{teamspace}/{group_name}: parameters: - - name: group_namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group - name: group_name type: string in: path @@ -9436,13 +10332,18 @@ paths: schema: $ref: "#/definitions/Error" - /groups/{group_namespace}/{group_name}/content_activity: + /groups/{workspace}/{teamspace}/{group_name}/content_activity: parameters: - - name: group_namespace + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to type: string + required: true + - name: teamspace in: path + description: the teamspace the array belongs to + type: string required: true - description: The namespace of the group - name: group_name type: string in: path @@ -9467,7 +10368,7 @@ paths: 200: description: Activity logs of group contents along with the pagination metadata schema: - $ref: "#/definitions/GroupActivityResponse" + $ref: "#/definitions/GroupContentActivityResponse" 502: description: Bad Gateway default: @@ -9475,18 +10376,19 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/log: + /taskgraphs/{workspace}/log: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true post: description: Create a task graph log. operationId: createTaskGraphLog tags: - task_graph_logs parameters: - - name: namespace - in: path - description: The namespace that will own this task graph log. - type: string - required: true - name: log in: body required: true @@ -9520,6 +10422,11 @@ paths: description: Include logs from only this user. type: string required: false + - name: status + in: query + description: Filter to only return these statuses + type: string + required: false - name: search in: query description: search string that will look at name. @@ -9572,11 +10479,11 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/logs/{id}: + /taskgraphs/{workspace}/logs/{id}: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph log. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9627,11 +10534,11 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/logs/{id}/report_client_node: + /taskgraphs/{workspace}/logs/{id}/report_client_node: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph log. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9660,11 +10567,11 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/executions/{id}/resubmit: + /taskgraphs/{workspace}/executions/{id}/resubmit: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph execution. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9689,11 +10596,11 @@ paths: schema: $ref: '#/definitions/Error' - /taskgraphs/{namespace}/executions/{id}/retry: + /taskgraphs/{workspace}/executions/{id}/retry: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph execution. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9718,11 +10625,11 @@ paths: schema: $ref: '#/definitions/Error' - /taskgraphs/{namespace}/executions/{id}/stop: + /taskgraphs/{workspace}/executions/{id}/stop: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph execution. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9736,10 +10643,8 @@ paths: tags: - task_graph_logs responses: - 202: - description: Information about the task graph execution. - schema: - $ref: "#/definitions/TaskGraphLog" + 204: + description: Graph stopped successfully 502: description: Bad Gateway default: @@ -9748,7 +10653,13 @@ paths: $ref: '#/definitions/Error' # Task graphs - /taskgraphs/{namespace}/graphs: + /taskgraphs/{workspace}/graphs: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true get: description: > Fetch the task graphs of a namespace the user has access to. The @@ -9759,12 +10670,6 @@ paths: Entries in the response are ordered from newest to oldest. Pagination parameters work as in other API methods; see PaginationMetadata. operationId: listTaskGraphs - parameters: - - name: namespace - in: path - description: Namespace for graphs - type: string - required: true tags: - task_graphs responses: @@ -9785,11 +10690,6 @@ paths: tags: - task_graphs parameters: - - name: namespace - in: path - description: Include graphs for this namespace. - type: string - required: true - name: graph in: body description: Create the task graph. @@ -9808,11 +10708,11 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/graphs/{id}: + /taskgraphs/{workspace}/graphs/{id}: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9860,11 +10760,11 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/graphs/{id}/submit: + /taskgraphs/{workspace}/graphs/{id}/submit: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this task graph. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: id @@ -9872,6 +10772,11 @@ paths: description: The UUID of the task graph entry. type: string required: true + - name: root_task_graph_uuid + in: query + description: UUID of the root taskgraph that this graph is assosiated with + type: string + required: false post: description: > Submit a single task graph for execution. @@ -9893,11 +10798,11 @@ paths: # Task graphs: Registration - /taskgraphs/{namespace}/registered/{name}: + /taskgraphs/{workspace}/registered/{name}: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns this registered UDF. + description: the workspace containing the teamspace the array belongs to type: string required: true - name: name @@ -9980,11 +10885,11 @@ paths: schema: $ref: "#/definitions/Error" - /taskgraphs/{namespace}/registered/{name}/share: + /taskgraphs/{workspace}/registered/{name}/share: parameters: - - name: namespace + - name: workspace in: path - description: The namespace that owns the registered task graph. + description: The workspace that owns the registered task graph. type: string required: true - name: name @@ -10048,3 +10953,163 @@ paths: description: error response schema: $ref: "#/definitions/Error" + + /assets/{workspace}/{teamspace}: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string + required: true + - name: asset_type + in: query + description: asset_type to filter to + type: string + required: false + - name: ownership_level + in: query + description: ownership_level to filter to (owned, shared) + type: string + required: false + - name: depth + in: query + description: depth of assets to be returned + type: string + required: false + - name: search + in: query + description: search string + type: string + required: false + - name: page + in: query + description: pagination offset + type: integer + required: false + - name: per_page + in: query + description: pagination limit + type: integer + required: false + - name: order_by + in: query + description: | + order by a specific property, defaults to `created_at desc` + supported values are created_at, name, asset_type + can also include the order type (asc or desc) separated by space + i.e. `name asc` `name desc` etc. + type: string + required: false + - name: expand + in: query + description: expansion option for the AssetInfo object to be added to the response + type: string + required: false + get: + tags: + - assets + description: List assets in a namespace + operationId: listAssets + responses: + 200: + description: Successful list of assets + schema: + $ref: "#/definitions/AssetListResponse" + 502: + description: Bad Gateway + default: + description: error response + schema: + $ref: "#/definitions/Error" + + /public_assets: + parameters: + - name: asset_type + in: query + description: asset_type to filter to + type: string + required: false + - name: depth + in: query + description: depth of assets to be returned + type: string + required: false + - name: search + in: query + description: search string + type: string + required: false + - name: page + in: query + description: pagination offset + type: integer + required: false + - name: per_page + in: query + description: pagination limit + type: integer + required: false + - name: order_by + in: query + description: | + order by a specific property, defaults to `created_at desc` + supported values are created_at, name, asset_type + can also include the order type (asc or desc) separated by space + i.e. `name asc` `name desc` etc. + type: string + required: false + get: + tags: + - assets + description: List public assets + operationId: listPublicAssets + responses: + 200: + description: Successful list of assets + schema: + $ref: "#/definitions/AssetListResponse" + 502: + description: Bad Gateway + default: + description: error response + schema: + $ref: "#/definitions/Error" + + /assets/{workspace}/{teamspace}/change_credentials: + parameters: + - name: workspace + in: path + description: the workspace containing the teamspace the array belongs to + type: string + required: true + - name: teamspace + in: path + description: the teamspace the array belongs to + type: string + required: true + post: + tags: + - assets + description: Changes the access credentials to the given assets + operationId: changeAssetCredentials + parameters: + - name: changeCredentialsRequest + in: body + description: aws access credentials to store for a namespace + schema: + $ref: "#/definitions/ChangeAssetCredentialsRequest" + required: true + responses: + 204: + description: Credentials changed successfully + 502: + description: Bad Gateway + default: + description: error response + schema: + $ref: "#/definitions/Error" diff --git a/openapitools.json b/openapitools.json new file mode 100644 index 0000000..f227cf2 --- /dev/null +++ b/openapitools.json @@ -0,0 +1,7 @@ +{ + "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json", + "spaces": 2, + "generator-cli": { + "version": "7.7.0" + } +} diff --git a/regen.sh b/regen.sh new file mode 100755 index 0000000..90edf6c --- /dev/null +++ b/regen.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +set -ex + +# Regenerate client code +openapi-generator-cli generate -i openapi-v1.yaml -g java -c config.yaml + +# Add all src files +git add src/{main,test}/java +# Add any other existing Git-tracked files (e.g. `.openapi-generator/FILES`) +git add -u . +# openapi-generator-cli tries to bump our Gradle version +git checkout HEAD -- gradle/wrapper/gradle-wrapper.properties + +# Apply custom code / patches +git cherry-pick -n patch + +# Commit changes +if git diff --quiet HEAD; then + echo "Nothing to commit" +else + git commit -m '`regen.sh`' +fi diff --git a/src/main/java/examples/Examples.java b/src/main/java/examples/Examples.java index 18a7442..1f72375 100644 --- a/src/main/java/examples/Examples.java +++ b/src/main/java/examples/Examples.java @@ -1,10 +1,11 @@ package examples; // Import classes: -import io.tiledb.cloud.*; +import io.tiledb.cloud.Pair; +import io.tiledb.cloud.TileDBClient; +import io.tiledb.cloud.TileDBLogin; import io.tiledb.cloud.rest_api.ApiException; -import io.tiledb.cloud.rest_api.api.GroupsApi; -import io.tiledb.cloud.rest_api.api.ArrayApi; +import io.tiledb.cloud.rest_api.api.TaskGraphsApi; import io.tiledb.cloud.rest_api.model.*; import org.apache.arrow.vector.ValueVector; @@ -19,333 +20,76 @@ public class Examples { public static void main(String[] args) throws ApiException { + String token = ""; + String URL = ""; // if using cloud for the first time create the client with a Login object to pass your credentials. TileDBClient tileDBClient = new TileDBClient( new TileDBLogin(null, null, - System.getenv("API_TOKEN"), + token, + false, true, true, - true, - "https://api.tiledb.com")); + URL)); // If the "RememberME" option is set to true in your first login you can access TileDB-Cloud without the need // to pass any credentials from now on. Just create the client as follows: // TileDBClient tileDBClient = new TileDBClient(); tileDBClient.setDebugging(true); - -// Uncomment to run whichever example you want - runGenericUDF(tileDBClient); - runArrayUDF(tileDBClient); - runMultiArrayUDF(tileDBClient); - getArray(tileDBClient); -// createArray(tileDBClient); -// registerArray(tileDBClient); - listArrays(tileDBClient); - listGroups(tileDBClient); -// deleteArray(tileDBClient); -// deregisterArray(tileDBClient); - runSQL(tileDBClient); - runSQLArrow(tileDBClient); - - } - - private static void runSQL(TileDBClient tileDBClient) { - SQLParameters sqlParameters = new SQLParameters(); - sqlParameters.setQuery("SELECT * FROM `tiledb://TileDB-Inc/quickstart_sparse`"); - TileDBSQL tileDBSQL = new TileDBSQL(tileDBClient, "unittest", sqlParameters); - System.out.println(tileDBSQL.exec()); - } - - private static void runSQLArrow(TileDBClient tileDBClient) { - SQLParameters sqlParameters = new SQLParameters(); - sqlParameters.setQuery("SELECT * FROM `tiledb://TileDB-Inc/quickstart_sparse`"); - TileDBSQL tileDBSQL = new TileDBSQL(tileDBClient, "unittest", sqlParameters); - Pair, Integer> a = tileDBSQL.execArrow(); - } - - /** - * Runs a generic UDF - * @param tileDBClient - */ - private static void runGenericUDF(TileDBClient tileDBClient){ - TileDBUDF tileDBUDF = new TileDBUDF(tileDBClient, "unittest"); - GenericUDF genericUDF = new GenericUDF(); - genericUDF.setUdfInfoName("TileDB-Inc/args-udf"); - HashMap arguments = new HashMap<>(); - arguments.put("arg1", "a1"); - arguments.put("arg2", "a2"); - genericUDF.setArgument(serializeArgs(arguments)); - System.out.println(tileDBUDF.executeGeneric(genericUDF)); //could be JSON or Arrow - } - - /** - * Runs an array UDF on a TileDB Array - * @param tileDBClient - */ - public static void runArrayUDF(TileDBClient tileDBClient){ - TileDBUDF tileDBUDF = new TileDBUDF(tileDBClient, "unittest"); - ArrayList range1 = new ArrayList<>(); - range1.add(BigDecimal.valueOf(1)); - range1.add(BigDecimal.valueOf(4)); - - ArrayList range2 = new ArrayList<>(); - range2.add(BigDecimal.valueOf(1)); - range2.add(BigDecimal.valueOf(4)); - - QueryRanges queryRanges = new QueryRanges(); - queryRanges.addRangesItem(range1); - queryRanges.addRangesItem(range2); - - HashMap argumentsForArrayUDF = new HashMap<>(); - argumentsForArrayUDF.put("attr", "rows"); - argumentsForArrayUDF.put("scale", 9); - - GenericUDF genericUDF = new GenericUDF(); - genericUDF.setUdfInfoName("TileDB-Inc/array-udf"); - genericUDF.setArgument(serializeArgs(argumentsForArrayUDF)); - - UDFArrayDetails array = new UDFArrayDetails(); - array.setUri("tiledb://TileDB-Inc/quickstart_sparse"); - - System.out.println(tileDBUDF.executeSingleArray(genericUDF, array, queryRanges, "unittest")); - } - - /** - * Runs a multi-array UDF on multiple TileDB arrays - * @param tileDBClient - */ - public static void runMultiArrayUDF(TileDBClient tileDBClient){ - TileDBUDF tileDBUDF = new TileDBUDF(tileDBClient, "unittest"); - - ArrayList range1 = new ArrayList<>(); - range1.add(BigDecimal.valueOf(1)); - range1.add(BigDecimal.valueOf(4)); - - ArrayList range2 = new ArrayList<>(); - range2.add(BigDecimal.valueOf(1)); - range2.add(BigDecimal.valueOf(4)); - - QueryRanges queryRanges = new QueryRanges(); - queryRanges.addRangesItem(range1); - queryRanges.addRangesItem(range2); - - MultiArrayUDF multiArrayUDF = new MultiArrayUDF(); - multiArrayUDF.setUdfInfoName("TileDB-Inc/multi-array-udf"); - - List arrays = new ArrayList<>(); - - //array1 - UDFArrayDetails array1 = new UDFArrayDetails(); - array1.setUri("tiledb://TileDB-Inc/quickstart_sparse"); - array1.setRanges(queryRanges); - array1.setBuffers(Arrays.asList("rows", "cols", "a")); - arrays.add(array1); - - //array2 - UDFArrayDetails array2 = new UDFArrayDetails(); - array2.setUri("tiledb://TileDB-Inc/quickstart_sparse-eu-west-2"); - array2.setRanges(queryRanges); - array2.setBuffers(Arrays.asList("rows", "cols", "a")); - arrays.add(array2); - - multiArrayUDF.setArrays(arrays); - - HashMap arguments = new HashMap<>(); - arguments.put("attr1", "a"); - arguments.put("attr2", "a"); - - multiArrayUDF.setArgument(serializeArgs(arguments)); - - System.out.println(tileDBUDF.executeMultiArray(multiArrayUDF)); +// runNextflowMethods(tileDBClient); } - /** - * Deregister an array - */ - private static void deregisterArray(TileDBClient tileDBClient) - { - String namespace = ""; // String | namespace array is in (an organization name or user's username) - String array = ""; // String | name/uri of array that is url-encoded - ArrayApi apiInstance = new ArrayApi(tileDBClient.getApiClient()); - try { - apiInstance.deregisterArray(namespace, array); - } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#deregisterArray"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - } - - /** - * Delete an array - */ - private static void deleteArray(TileDBClient tileDBClient) - { - String namespace = ""; // String | namespace array is in (an organization name or user's username) - String array = ""; // String | name/uri of array that is url-encoded - String contentType = "application/json"; // String | Content Type of input and return mime - ArrayApi apiInstance = new ArrayApi(tileDBClient.getApiClient()); - try { - apiInstance.deleteArray(namespace, array, contentType); - } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#deleteArray"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - } - - private static void listGroups(TileDBClient tileDBClient) - { - GroupsApi apiInstance = new GroupsApi(tileDBClient.getApiClient()); - Integer page = null; // Integer | pagination offset - Integer perPage = null; // Integer | pagination limit - String search = null; // String | search string that will look at name, namespace or description fields - String namespace = "unittest"; // String | namespace - String orderby = null; // String | sort by which field valid values include last_accessed, size, name - String permissions = null; // String | permissions valid values include read, read_write, write, admin - String groupType = "generic"; // String | filter by a specific group type - List tag = null; // List | tag to search for, more than one can be included - List excludeTag = null; // List | tags to exclude matching array in results, more than one can be included - Boolean flat = true; // Boolean | if true, ignores the nesting of groups and searches all of them - String parent = null; // String | search only the children of the groups with this uuid - Boolean withMetadata = false; - try { - GroupBrowserData result = apiInstance.listPublicGroups(page, perPage, groupType, search, namespace, orderby, permissions, tag, excludeTag, flat, parent, withMetadata); - //or use api.listOwnedGroups(...) / api.listSharedGroups(...) - System.out.println(result.getGroups()); - } catch (ApiException e) { - System.err.println("Exception when calling GroupsApi#listPublicGroups"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - - } - - private static void listArrays(TileDBClient tileDBClient) - { - String namespace = "unittest"; // String | namespace array is in (an organization name or user's username) - Boolean withMetadata = false; - ArrayApi apiInstance = new ArrayApi(tileDBClient.getApiClient()); - - try { - List result = apiInstance.getArraysInNamespace(namespace, withMetadata); - System.out.println(result); - } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#getArraysInNamespace"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - } - - private static void getArray(TileDBClient tileDBClient){ - String namespace = "TileDB-Inc"; // String | namespace array is in (an organization name or user's username) - String array = "quickstart_sparse"; // String | name/uri of array that is url-encoded - String contentType = "application/json"; // String | Content Type of input and return mime - ArrayApi apiInstance = new ArrayApi(tileDBClient.getApiClient()); - - try { - ArraySchema result = apiInstance.getArray(namespace, array, contentType); - System.out.println(result); - } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#getArray"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - } - - private static void createArray(TileDBClient tileDBClient){ - String namespace = ""; // String | namespace array is in (an organization name or user's username) - String arrayName = "s3:///my_array"; // String | name/uri of array that is url-encoded // - String contentType = "application/json"; // String | Content Type of input and return mime - - Dimension d1 = new Dimension(); - - d1.setName("d1"); - - d1.setType(Datatype.INT64); - - DomainArray domainArray = new DomainArray(); - domainArray.addInt64Item(0L); - domainArray.addInt64Item(4L); - d1.setDomain(domainArray); - - DimensionTileExtent tileExtent = new DimensionTileExtent().int64(2L); - d1.setTileExtent(tileExtent); - d1.setNullTileExtent(false); - - // Create and set getDomain - Domain domain = new Domain(); - domain.setTileOrder(Layout.ROW_MAJOR); - domain.setCellOrder(Layout.ROW_MAJOR); - domain.setType(Datatype.INT64); - domain.addDimensionsItem(d1); - - // Create and add Attributes - Attribute a1 = new Attribute(); - a1.setName("a1"); - a1.setType(Datatype.INT32); - a1.setNullable(true); - - ArraySchema schema = new ArraySchema(); - schema.addVersionItem(10); - - FilterPipeline filterPipeline = new FilterPipeline(); - filterPipeline.addFiltersItem(new Filter().type(FilterType.ZSTD)); - - schema.setOffsetFilterPipeline(filterPipeline); - schema.setCoordsFilterPipeline(filterPipeline); - - schema.setDomain(domain); - schema.setCapacity(1000); - schema.addAttributesItem(a1); - schema.setArrayType(ArrayType.DENSE); - schema.setTileOrder(Layout.ROW_MAJOR); - schema.setCellOrder(Layout.ROW_MAJOR); - System.out.println(schema); - - ArrayApi apiInstance = new ArrayApi(tileDBClient.getApiClient()); - - try { - apiInstance.createArray(namespace, arrayName, contentType, schema, null); - } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#createArray"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - } - - public static void registerArray(TileDBClient tileDBClient){ - String namespace = ""; // String | namespace array is in (an organization name or user's username) - String array = "s3:////"; // String | name/uri of array that is url-encoded - ArrayInfoUpdate arrayMetadata = new ArrayInfoUpdate(); // ArrayInfoUpdate | metadata associated with array - arrayMetadata.setUri("s3:////"); - arrayMetadata.setName(""); - ArrayApi apiInstance = new ArrayApi(tileDBClient.getApiClient()); - - try { - ArrayInfo result = apiInstance.registerArray(namespace, array, arrayMetadata); - System.out.println(result); - } catch (ApiException e) { - System.err.println("Exception when calling ArrayApi#registerArray"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } + public static void runNextflowMethods(TileDBClient tileDBClient) throws ApiException { + String namespace = ""; + TaskGraphNode node = new TaskGraphNode(); + node.name("dstara"); + String uuid = "23be1141-e11a-4853-bf00-b5e5ec64315d"; + node.clientNodeId(uuid); + + // TODO: set retry strategy + node.retryStrategy(new RetryStrategy().limit(0)); + + // TODO: set timeout + // task.config.getTime() + + TGUDFNodeData nodeData = new TGUDFNodeData(); + + TGUDFArgument workDirArg = new TGUDFArgument(); + workDirArg.setName("workDirS3Path"); + workDirArg.setValue("s3://tiledb-dstara"); + nodeData.addArgumentsItem(workDirArg); + + TGUDFEnvironment environment = new TGUDFEnvironment(); + environment.setLanguage(UDFLanguage.NEXTFLOW); + environment.setImageName("debian:latest"); + environment.setAccessCredentialsName(""); + + TGUDFEnvironmentResources environmentResources = new TGUDFEnvironmentResources(); + environmentResources.setCpu("1"); +// environmentResources.setGpu(1); + environmentResources.setMemory("4Gi"); + environment.resources(environmentResources); + + //storage + TGUDFStorage storage = new TGUDFStorage(); + storage.setPath("/tmp"); + storage.setTiledbUri("tiledb:" + "" + "/" + ""); + List myStorageList = new ArrayList<>(); + myStorageList.add(storage); + environment.setStorage(myStorageList); + + nodeData.environment(environment); + node.setUdfNode(nodeData); + + + // Begin task graph + TaskGraph tg = new TaskGraph(); + tg.name("dstara"); + tg.addNodesItem(node); + TaskGraphsApi taskGraphsApi = new TaskGraphsApi(tileDBClient.getApiClient()); + TaskGraph res = taskGraphsApi.createTaskGraph(namespace, tg); + taskGraphsApi.submitTaskGraph(namespace, res.getUuid(), ""); } } diff --git a/src/main/java/io/tiledb/cloud/CustomCode.txt b/src/main/java/io/tiledb/cloud/CustomCode.txt index bb670c0..cff7227 100644 --- a/src/main/java/io/tiledb/cloud/CustomCode.txt +++ b/src/main/java/io/tiledb/cloud/CustomCode.txt @@ -18,8 +18,8 @@ SqlApi.java 0 error response - */ -public ApiResponse runSQLWithHttpInfoBytes(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = runSQLValidateBeforeCall(namespace, sql, acceptEncoding, null); +public ApiResponse runSQLWithHttpInfoBytes(String workspace, String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { + okhttp3.Call localVarCall = runSQLValidateBeforeCall(workspace, namespace, sql, acceptEncoding, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -40,8 +40,8 @@ public ApiResponse runSQLWithHttpInfoBytes(String namespace, SQLParamete 0 error response - */ -public byte[] runSQLBytes(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = runSQLWithHttpInfoBytes(namespace, sql, acceptEncoding); +public byte[] runSQLBytes(String workspace, String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { + ApiResponse localVarResp = runSQLWithHttpInfoBytes(workspace, namespace, sql, acceptEncoding); return localVarResp.getData(); } @@ -49,208 +49,208 @@ public byte[] runSQLBytes(String namespace, SQLParameters sql, String acceptEnco UdfApi.java /** -* -* submit a generic UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return ApiResponse<String> -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a generic UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return ApiResponse<String> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public ApiResponse submitGenericUDFWithHttpInfoString(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); - Type localVarReturnType = new TypeToken(){}.getType(); - return localVarApiClient.execute(localVarCall, localVarReturnType); + okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); } /** -* -* submit a generic UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return String -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a generic UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return String + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public String submitGenericUDFString(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitGenericUDFWithHttpInfoString(namespace, udf, acceptEncoding); - return localVarResp.getData(); + ApiResponse localVarResp = submitGenericUDFWithHttpInfoString(namespace, udf, acceptEncoding); + return localVarResp.getData(); } /** -* -* submit a generic UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return byte[] -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a generic UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return byte[] + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public byte[] submitGenericUDFBytes(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitGenericUDFWithHttpInfoBytes(namespace, udf, acceptEncoding); - return localVarResp.getData(); + ApiResponse localVarResp = submitGenericUDFWithHttpInfoBytes(namespace, udf, acceptEncoding); + return localVarResp.getData(); } /** -* -* submit a generic UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return ApiResponse<byte[]> -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a generic UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return ApiResponse<byte[]> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public ApiResponse submitGenericUDFWithHttpInfoBytes(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); - Type localVarReturnType = new TypeToken(){}.getType(); - return localVarApiClient.execute(localVarCall, localVarReturnType); + okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); } /** -* -* submit a generic UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return Object -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a generic UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return Object + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public Object submitGenericUDFObj(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitGenericUDFWithHttpInfoObj(namespace, udf, acceptEncoding); - return localVarResp.getData(); + ApiResponse localVarResp = submitGenericUDFWithHttpInfoObj(namespace, udf, acceptEncoding); + return localVarResp.getData(); } /** -* -* submit a generic UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return ApiResponse<Object> -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a generic UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return ApiResponse<Object> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public ApiResponse submitGenericUDFWithHttpInfoObj(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); - Type localVarReturnType = new TypeToken(){}.getType(); - return localVarApiClient.execute(localVarCall, localVarReturnType); + okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); } /** -* -* submit a multi-array UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return String -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a multi-array UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return String + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public String submitMultiArrayUDFString(String namespace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitMultiArrayUDFWithHttpInfoString(namespace, udf, acceptEncoding); - return localVarResp.getData(); + ApiResponse localVarResp = submitMultiArrayUDFWithHttpInfoString(namespace, udf, acceptEncoding); + return localVarResp.getData(); } /** -* -* submit a multi-array UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return ApiResponse<String> -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a multi-array UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return ApiResponse<String> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public ApiResponse submitMultiArrayUDFWithHttpInfoString(String namespace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); - Type localVarReturnType = new TypeToken(){}.getType(); - return localVarApiClient.execute(localVarCall, localVarReturnType); + okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); } /** -* -* submit a multi-array UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return byte[] -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a multi-array UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return byte[] + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public byte[] submitMultiArrayUDFBytes(String namespace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitMultiArrayUDFWithHttpInfoBytes(namespace, udf, acceptEncoding); - return localVarResp.getData(); + ApiResponse localVarResp = submitMultiArrayUDFWithHttpInfoBytes(namespace, udf, acceptEncoding); + return localVarResp.getData(); } /** -* -* submit a multi-array UDF in the given namespace -* @param namespace namespace array is in (an organization name or user's username) (required) -* @param udf UDF to run (required) -* @param acceptEncoding Encoding to use (optional) -* @return ApiResponse<byte[]> -* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body -* @http.response.details + * + * submit a multi-array UDF in the given namespace + * @param namespace namespace array is in (an organization name or user's username) (required) + * @param udf UDF to run (required) + * @param acceptEncoding Encoding to use (optional) + * @return ApiResponse<byte[]> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details
Status Code Description Response Headers
200 UDF completed and the UDF-type specific result is returned * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
-*/ + */ public ApiResponse submitMultiArrayUDFWithHttpInfoBytes(String namespace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); - Type localVarReturnType = new TypeToken(){}.getType(); - return localVarApiClient.execute(localVarCall, localVarReturnType); + okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + Type localVarReturnType = new TypeToken(){}.getType(); + return localVarApiClient.execute(localVarCall, localVarReturnType); } /** @@ -271,8 +271,8 @@ public ApiResponse submitMultiArrayUDFWithHttpInfoBytes(String namespace 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ -public String submitUDFString(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - ApiResponse localVarResp = submitUDFWithHttpInfoString(namespace, array, udf, xPayer, acceptEncoding, v2); +public String submitUDFString(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + ApiResponse localVarResp = submitUDFWithHttpInfoString(workspace, namespace, array, udf, xPayer, acceptEncoding, v2); return localVarResp.getData(); } @@ -294,8 +294,8 @@ public String submitUDFString(String namespace, String array, MultiArrayUDF udf, 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ -public ApiResponse submitUDFWithHttpInfoString(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - okhttp3.Call localVarCall = submitUDFValidateBeforeCall(namespace, array, udf, xPayer, acceptEncoding, v2, null); +public ApiResponse submitUDFWithHttpInfoString(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + okhttp3.Call localVarCall = submitUDFValidateBeforeCall(workspace, namespace, array, udf, xPayer, acceptEncoding, v2, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -318,8 +318,8 @@ public ApiResponse submitUDFWithHttpInfoString(String namespace, String 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ -public byte[] submitUDFBytes(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - ApiResponse localVarResp = submitUDFWithHttpInfoBytes(namespace, array, udf, xPayer, acceptEncoding, v2); +public byte[] submitUDFBytes(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + ApiResponse localVarResp = submitUDFWithHttpInfoBytes(workspace, namespace, array, udf, xPayer, acceptEncoding, v2); return localVarResp.getData(); } @@ -341,8 +341,8 @@ public byte[] submitUDFBytes(String namespace, String array, MultiArrayUDF udf, 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ -public ApiResponse submitUDFWithHttpInfoBytes(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - okhttp3.Call localVarCall = submitUDFValidateBeforeCall(namespace, array, udf, xPayer, acceptEncoding, v2, null); +public ApiResponse submitUDFWithHttpInfoBytes(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + okhttp3.Call localVarCall = submitUDFValidateBeforeCall(workspace, namespace, array, udf, xPayer, acceptEncoding, v2, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); -} \ No newline at end of file +} diff --git a/src/main/java/io/tiledb/cloud/TileDBSQL.java b/src/main/java/io/tiledb/cloud/TileDBSQL.java deleted file mode 100644 index ee06055..0000000 --- a/src/main/java/io/tiledb/cloud/TileDBSQL.java +++ /dev/null @@ -1,128 +0,0 @@ -package io.tiledb.cloud; - -import io.tiledb.cloud.rest_api.ApiException; -import io.tiledb.cloud.rest_api.api.SqlApi; -import io.tiledb.cloud.rest_api.model.ResultFormat; -import io.tiledb.cloud.rest_api.model.SQLParameters; -import org.apache.arrow.memory.RootAllocator; -import org.apache.arrow.memory.unsafe.UnsafeAllocationManager; -import org.apache.arrow.vector.FieldVector; -import org.apache.arrow.vector.ValueVector; -import org.apache.arrow.vector.VectorSchemaRoot; -import org.apache.arrow.vector.ipc.ArrowStreamReader; -import org.apache.arrow.vector.util.TransferPair; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.*; -import org.apache.arrow.compression.CommonsCompressionFactory; - -public class TileDBSQL implements AutoCloseable{ - private String namespace; - - private SQLParameters sql; - - private TileDBClient tileDBClient; - - private SqlApi apiInstance; - - private ArrayList readBatches; - - private List results; - - private ArrowStreamReader reader; - - /** - * - * @param tileDBClient The TileDBClient - * @param namespace namespace to run task under is in (an organization name or user's username) - * @param sql sql being submitted - */ - public TileDBSQL(TileDBClient tileDBClient, String namespace, SQLParameters sql) { - Objects.requireNonNull(tileDBClient, "TileDBClient can not be null"); - Objects.requireNonNull(namespace, "Namespace can not be null"); - Objects.requireNonNull(sql, "SQL parameters can not be null"); - this.namespace = namespace; - this.sql = sql; - this.tileDBClient = tileDBClient; - this.apiInstance = new SqlApi(this.tileDBClient.getApiClient()); - this.readBatches = new ArrayList<>(); - } - - /** - * Exec an SQL query and get results in arrow format. - * - * @return A pair that consists of an ArrayList of all valueVectors and the - * number of batches read. - */ - public Pair, Integer> execArrow(){ - try { - if (sql.getResultFormat() != ResultFormat.ARROW && sql.getResultFormat() != null){ - throw new ApiException("The ResultFormat you specified is not 'ARROW'. Since you are calling " + - "'execArrow()' you can not specify a different ResultFormat. "); - } - sql.setResultFormat(ResultFormat.ARROW); - byte[] bytes = apiInstance.runSQLBytes(namespace, sql, "none"); - ArrayList valueVectors = null; - int readBatchesCount = 0; - -// RootAllocator allocator = new RootAllocator(Long.MAX_VALUE); - RootAllocator allocator = new RootAllocator(RootAllocator.configBuilder().allocationManagerFactory(UnsafeAllocationManager.FACTORY).build()); - ArrowStreamReader reader = new ArrowStreamReader(new ByteArrayInputStream(bytes), allocator, CommonsCompressionFactory.INSTANCE); - - VectorSchemaRoot root = reader.getVectorSchemaRoot(); - - while(reader.loadNextBatch()) { - readBatchesCount++; - valueVectors = new ArrayList<>(); - for (FieldVector f : root.getFieldVectors()) { - // transfer will not copy data but transfer ownership of memory - // from ArrowStreamReader to TileDBSQL. This is necessary because - // otherwise we are not able to close the reader and retain the - // data. - TransferPair t = f.getTransferPair(allocator); - t.transfer(); - valueVectors.add(t.getTo()); - } - } - reader.close(); - return new Pair<>(valueVectors, readBatchesCount); - - } catch (IOException | ApiException e) { - throw new RuntimeException(e); - } - } - - /** - * Exec an SQL query and get results in any format except arrow. - * - * @return - */ - public List> exec(){ - try { - if (sql.getResultFormat() == null ){ - return apiInstance.runSQL(namespace, sql, ResultFormat.TILEDB_JSON.toString()); - } else { - return apiInstance.runSQL(namespace, sql, sql.getResultFormat().toString()); - } - } catch (ApiException e) { - System.err.println("Exception when calling SqlApi#runSQL/runSQLBytes"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - /** - * - */ - public void close(){ - try { - reader.close(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/src/main/java/io/tiledb/cloud/TileDBUDF.java b/src/main/java/io/tiledb/cloud/TileDBUDF.java deleted file mode 100644 index 1641105..0000000 --- a/src/main/java/io/tiledb/cloud/TileDBUDF.java +++ /dev/null @@ -1,529 +0,0 @@ -package io.tiledb.cloud; - -import io.tiledb.cloud.rest_api.ApiException; -import io.tiledb.cloud.rest_api.api.UdfApi; -import io.tiledb.cloud.rest_api.model.*; -import org.apache.arrow.vector.ValueVector; -import org.json.JSONArray; -import org.json.JSONObject; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import static io.tiledb.cloud.TileDBUtils.serializeArgs; - -public class TileDBUDF { - private TileDBClient tileDBClient; - private String namespace; - private UdfApi apiInstance; - - public TileDBUDF(TileDBClient tileDBClient, String namespace) { - this.tileDBClient = tileDBClient; - this.namespace = namespace; - this.apiInstance = new UdfApi(this.tileDBClient.getApiClient()); - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @param arguments The UDF arguments - * @return The result in String format - */ - public String executeGeneric(GenericUDF genericUDF, HashMap arguments){ - String serializedArgs = serializeArgs(arguments); - genericUDF.setArgument(serializedArgs); - try { - return apiInstance.submitGenericUDFString(namespace, genericUDF, "none"); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitGenericUDF"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @return The result in String format - */ - public String executeGeneric(GenericUDF genericUDF){ - try { - return apiInstance.submitGenericUDFString(namespace, genericUDF, "none"); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitGenericUDF"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @param arguments The UDF arguments - * @return The result as a JSON object - */ - public JSONObject executeGenericJSON(GenericUDF genericUDF, HashMap arguments){ - genericUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeGeneric(genericUDF, arguments); - return new JSONObject(jsonString); - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @return The result as a JSON object - */ - public JSONObject executeGenericJSON(GenericUDF genericUDF){ - genericUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeGeneric(genericUDF); - return new JSONObject(jsonString); - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @param arguments The UDF arguments - * @return The result as a JSON array object - */ - public JSONArray executeGenericJSONArray(GenericUDF genericUDF, HashMap arguments){ - genericUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeGeneric(genericUDF, arguments); - return new JSONArray(jsonString); - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @return The result as a JSON array object - */ - public JSONArray executeGenericJSONArray(GenericUDF genericUDF){ - genericUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeGeneric(genericUDF); - return new JSONArray(jsonString); - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @param arguments The UDF arguments - * @return A pair that consists of an ArrayList of all valueVectors and the number of batches read. - */ - public Pair, Integer> executeGenericArrow(GenericUDF genericUDF, - HashMap arguments){ - String serializedArgs = serializeArgs(arguments); - genericUDF.setArgument(serializedArgs); - genericUDF.setResultFormat(ResultFormat.ARROW); - try { - byte[] bytes = apiInstance.submitGenericUDFBytes(namespace, genericUDF, "none"); - return TileDBUtils.createValueVectors(bytes); - } catch (IOException | ApiException e) { - e.printStackTrace(); - } - return null; - } - - /** - * Executes a generic-UDF. A generic-UDF is a UDF that is not using a TIleDB array. - * - * @param genericUDF The generic UDF definition - * @return A pair that consists of an ArrayList of all valueVectors and the number of batches read. - */ - public Pair, Integer> executeGenericArrow(GenericUDF genericUDF){ - genericUDF.setResultFormat(ResultFormat.ARROW); - try { - byte[] bytes = apiInstance.submitGenericUDFBytes(namespace, genericUDF, "none"); - return TileDBUtils.createValueVectors(bytes); - } catch (IOException | ApiException e) { - e.printStackTrace(); - } - return null; - } - - @Deprecated - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param multiArrayUDF The array-UDF. Can reference one arrays - * @param arguments The UDF arguments - * @param arrayURI The array URI - * @param xPayer Name of organization or user who should be charged for this request - * @return The results as a String - * @apiNote is replaced by executeSingleArray(GenericUDF genericUDF, UDFArrayDetails array, - * QueryRanges queryRanges, String xPayer) - */ - public String executeSingleArray(MultiArrayUDF multiArrayUDF, HashMap arguments, String arrayURI, String xPayer){ - String serializedArgs = serializeArgs(arguments); - multiArrayUDF.setArgument(serializedArgs); - - String[] split = breakdownFullURI(arrayURI); - - try { - return apiInstance.submitUDFString(split[0], split[1], multiArrayUDF, xPayer, "none", ""); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitUDF"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param genericUDF The UDF to run - * @param array The Array to run the UDF on - * @param queryRanges the Query ranges - * @param xPayer Name of organization or user who should be charged for this request - * @return The results as a String - */ - public String executeSingleArray(GenericUDF genericUDF, UDFArrayDetails array, - QueryRanges queryRanges, String xPayer){ - List arrays = new ArrayList<>(); - arrays.add(array); - - MultiArrayUDF multiArrayUDF = new MultiArrayUDF(); - multiArrayUDF.setArgument(genericUDF.getArgument()); - multiArrayUDF.setUdfInfoName(genericUDF.getUdfInfoName()); - multiArrayUDF.setRanges(queryRanges); - multiArrayUDF.setArrays(arrays); - String[] split = breakdownFullURI(array.getUri()); - - try { - return apiInstance.submitUDFString(split[0], split[1], multiArrayUDF, xPayer, "none", ""); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitUDF"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - @Deprecated - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param multiArrayUDF The array-UDF. Can reference one arrays - * @param arguments The UDF arguments - * @param arrayURI The array URI - * @param xPayer Name of organization or user who should be charged for this request - * @return The results as a JSON Object - * @apiNote Is replaced by executeSingleArrayJSON(GenericUDF genericUDF, UDFArrayDetails array, - * QueryRanges queryRanges, String xPayer) - */ - public JSONObject executeSingleArrayJSON(MultiArrayUDF multiArrayUDF, HashMap arguments, String arrayURI, String xPayer){ - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeSingleArray(multiArrayUDF, arguments, arrayURI, xPayer); - return new JSONObject(jsonString); - } - - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param genericUDF The UDF to run - * @param array The Array to run the UDF on - * @param queryRanges the Query ranges - * @param xPayer Name of organization or user who should be charged for this request - * @return The results as a JSON Object - */ - public JSONObject executeSingleArrayJSON(GenericUDF genericUDF, UDFArrayDetails array, - QueryRanges queryRanges, String xPayer){ - - List arrays = new ArrayList<>(); - arrays.add(array); - - MultiArrayUDF multiArrayUDF = new MultiArrayUDF(); - multiArrayUDF.setArgument(genericUDF.getArgument()); - multiArrayUDF.setUdfInfoName(genericUDF.getUdfInfoName()); - multiArrayUDF.setRanges(queryRanges); - multiArrayUDF.setArrays(arrays); - String[] split = breakdownFullURI(array.getUri()); - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String result = ""; - try { - result = apiInstance.submitUDFString(split[0], split[1], multiArrayUDF, xPayer, "none", ""); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitUDF"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return new JSONObject(result); - } - - @Deprecated - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param multiArrayUDF The array-UDF. Can reference one arrays - * @param arguments The UDF arguments - * @param arrayURI The array URI - * @param xPayer Name of organization or user who should be charged for this request - * @return The results as a JSON array - * @apiNote Is replaced by executeSingleArrayJSONArray(GenericUDF genericUDF, UDFArrayDetails array, - * QueryRanges queryRanges, String xPayer) - */ - public JSONArray executeSingleArrayJSONArray(MultiArrayUDF multiArrayUDF, HashMap arguments, String arrayURI, String xPayer){ - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeSingleArray(multiArrayUDF, arguments, arrayURI, xPayer); - return new JSONArray(jsonString); - } - - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param genericUDF The UDF to run - * @param array The Array to run the UDF on - * @param queryRanges the Query ranges - * @param xPayer Name of organization or user who should be charged for this request - * @return The results as a JSON Object - */ - public JSONArray executeSingleArrayJSONArray(GenericUDF genericUDF, UDFArrayDetails array, - QueryRanges queryRanges, String xPayer){ - List arrays = new ArrayList<>(); - arrays.add(array); - - MultiArrayUDF multiArrayUDF = new MultiArrayUDF(); - multiArrayUDF.setArgument(genericUDF.getArgument()); - multiArrayUDF.setUdfInfoName(genericUDF.getUdfInfoName()); - multiArrayUDF.setRanges(queryRanges); - multiArrayUDF.setArrays(arrays); - String[] split = breakdownFullURI(array.getUri()); - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String result = ""; - try { - result = apiInstance.submitUDFString(split[0], split[1], multiArrayUDF, xPayer, "none", ""); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitUDF"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return new JSONArray(result); - } - - @Deprecated - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param multiArrayUDF The array-UDF. Can reference one arrays - * @param arguments The UDF arguments - * @param arrayURI The array URI - * @param xPayer Name of organization or user who should be charged for this request - * @return The results in arrow format - * @apiNote Is replaced by executeSingleArrayArrow(GenericUDF genericUDF, UDFArrayDetails array, - * QueryRanges queryRanges, String xPayer) - */ - public Pair, Integer> executeSingleArrayArrow(MultiArrayUDF multiArrayUDF, HashMap arguments, String arrayURI, String xPayer){ - String serializedArgs = serializeArgs(arguments); - multiArrayUDF.setArgument(serializedArgs); - multiArrayUDF.setResultFormat(ResultFormat.ARROW); - - String[] split = breakdownFullURI(arrayURI); - - try { - byte[] bytes = apiInstance.submitUDFBytes(split[0], split[1], multiArrayUDF, xPayer, "none", ""); - return TileDBUtils.createValueVectors(bytes); - } catch (IOException | ApiException e) { - e.printStackTrace(); - } - return null; - } - - /** - * Executes an array-UDF. An array-UDF is a UDF applied to a TileDB array - * - * @param genericUDF The UDF to run - * @param array The Array to run the UDF on - * @param queryRanges the Query ranges - * @param xPayer Name of organization or user who should be charged for this request - * @return The results in arrow format - */ - public Pair, Integer> executeSingleArrayArrow(GenericUDF genericUDF, UDFArrayDetails array, - QueryRanges queryRanges, String xPayer){ - List arrays = new ArrayList<>(); - arrays.add(array); - - MultiArrayUDF multiArrayUDF = new MultiArrayUDF(); - multiArrayUDF.setArgument(genericUDF.getArgument()); - multiArrayUDF.setResultFormat(ResultFormat.ARROW); - multiArrayUDF.setUdfInfoName(genericUDF.getUdfInfoName()); - multiArrayUDF.setRanges(queryRanges); - multiArrayUDF.setArrays(arrays); - String[] split = breakdownFullURI(array.getUri()); - - try { - byte[] bytes = apiInstance.submitUDFBytes(split[0], split[1], multiArrayUDF, xPayer, "none", ""); - return TileDBUtils.createValueVectors(bytes); - } catch (IOException | ApiException e) { - e.printStackTrace(); - } - return null; - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @param arguments The arguments - * @return The results as a String - */ - public String executeMultiArray(MultiArrayUDF multiArrayUDF, HashMap arguments){ - String serializedArgs = serializeArgs(arguments); - multiArrayUDF.setArgument(serializedArgs); - try { - return apiInstance.submitMultiArrayUDFString(this.namespace, multiArrayUDF, "none"); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitMultiArrayUDFString"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @return The results as a String - */ - public String executeMultiArray(MultiArrayUDF multiArrayUDF){ - try { - return apiInstance.submitMultiArrayUDFString(this.namespace, multiArrayUDF, "none"); - } catch (ApiException e) { - System.err.println("Exception when calling UdfApi#submitMultiArrayUDFString"); - System.err.println("Status code: " + e.getCode()); - System.err.println("Reason: " + e.getResponseBody()); - System.err.println("Response headers: " + e.getResponseHeaders()); - e.printStackTrace(); - } - return null; - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @param arguments The arguments - * @return The results as JSON object - */ - public JSONObject executeMultiArrayJSON(MultiArrayUDF multiArrayUDF, HashMap arguments){ - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeMultiArray(multiArrayUDF, arguments); - return new JSONObject(jsonString); - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @return The results as JSON object - */ - public JSONObject executeMultiArrayJSON(MultiArrayUDF multiArrayUDF){ - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeMultiArray(multiArrayUDF); - return new JSONObject(jsonString); - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @param arguments The arguments - * @return The results as JSON Array - */ - public JSONArray executeMultiArrayJSONArray(MultiArrayUDF multiArrayUDF, HashMap arguments){ - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeMultiArray(multiArrayUDF, arguments); - return new JSONArray(jsonString); - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @return The results as JSON Array - */ - public JSONArray executeMultiArrayJSONArray(MultiArrayUDF multiArrayUDF){ - multiArrayUDF.setResultFormat(ResultFormat.JSON); - String jsonString = this.executeMultiArray(multiArrayUDF); - return new JSONArray(jsonString); - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @param arguments The arguments - * @return The results in arrow format - */ - public Pair, Integer> executeMultiArrayArrow(MultiArrayUDF multiArrayUDF, HashMap arguments){ - String serializedArgs = serializeArgs(arguments); - multiArrayUDF.setArgument(serializedArgs); - multiArrayUDF.setResultFormat(ResultFormat.ARROW); - - try { - byte[] bytes = apiInstance.submitMultiArrayUDFBytes(this.namespace, multiArrayUDF, "none"); - return TileDBUtils.createValueVectors(bytes); - } catch (IOException | ApiException e) { - e.printStackTrace(); - } - return null; - } - - /** - * Executes a multi-array-UDF. A multi- array-UDF is a UDF applied to multiple TileDB arrays - * - * @param multiArrayUDF The multiArrayUDF input object - * @return The results in arrow format - */ - public Pair, Integer> executeMultiArrayArrow(MultiArrayUDF multiArrayUDF){ - multiArrayUDF.setResultFormat(ResultFormat.ARROW); - - try { - byte[] bytes = apiInstance.submitMultiArrayUDFBytes(this.namespace, multiArrayUDF, "none"); - return TileDBUtils.createValueVectors(bytes); - } catch (IOException | ApiException e) { - e.printStackTrace(); - } - return null; - } - - /** - * Breaks down a full uri to its components - * @param arrayURI The input full uri - * @return An array of strings - */ - private String[] breakdownFullURI(String arrayURI) { - arrayURI = arrayURI.replaceAll("tiledb://", ""); //remove tiledb prefix - //split uri to get namespace and array name - String[] split = arrayURI.split("/"); - if (split.length != 2) - throw new RuntimeException( - "TileDB URI is in the wrong format. The format should be: tiledb://namespace/array_name"); - return split; - } -} diff --git a/src/main/java/io/tiledb/cloud/rest_api/ApiException.java b/src/main/java/io/tiledb/cloud/rest_api/ApiException.java index 808e648..764c77e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/ApiException.java +++ b/src/main/java/io/tiledb/cloud/rest_api/ApiException.java @@ -21,7 +21,7 @@ *

ApiException class.

*/ @SuppressWarnings("serial") -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ApiException extends Exception { private static final long serialVersionUID = 1L; diff --git a/src/main/java/io/tiledb/cloud/rest_api/Configuration.java b/src/main/java/io/tiledb/cloud/rest_api/Configuration.java index c2eae8b..b237260 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/Configuration.java +++ b/src/main/java/io/tiledb/cloud/rest_api/Configuration.java @@ -13,7 +13,7 @@ package io.tiledb.cloud.rest_api; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Configuration { public static final String VERSION = "2.17.51"; diff --git a/src/main/java/io/tiledb/cloud/rest_api/JSON.java b/src/main/java/io/tiledb/cloud/rest_api/JSON.java index 4f699ea..1dfec31 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/JSON.java +++ b/src/main/java/io/tiledb/cloud/rest_api/JSON.java @@ -121,6 +121,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.AttributeBufferHeader.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.AttributeBufferSize.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.Backoff.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.ChangeAssetCredentialsRequest.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.Dimension.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.DimensionCoordinate.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new io.tiledb.cloud.rest_api.model.DimensionTileExtent.CustomTypeAdapterFactory()); diff --git a/src/main/java/io/tiledb/cloud/rest_api/Pair.java b/src/main/java/io/tiledb/cloud/rest_api/Pair.java index 5fbb234..3960c7e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/Pair.java +++ b/src/main/java/io/tiledb/cloud/rest_api/Pair.java @@ -13,7 +13,7 @@ package io.tiledb.cloud.rest_api; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Pair { private String name = ""; private String value = ""; diff --git a/src/main/java/io/tiledb/cloud/rest_api/ServerConfiguration.java b/src/main/java/io/tiledb/cloud/rest_api/ServerConfiguration.java index d39750a..d2a6463 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/ServerConfiguration.java +++ b/src/main/java/io/tiledb/cloud/rest_api/ServerConfiguration.java @@ -5,7 +5,7 @@ /** * Representing a Server configuration. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ServerConfiguration { public String URL; public String description; diff --git a/src/main/java/io/tiledb/cloud/rest_api/ServerVariable.java b/src/main/java/io/tiledb/cloud/rest_api/ServerVariable.java index c9db9f5..a4c0431 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/ServerVariable.java +++ b/src/main/java/io/tiledb/cloud/rest_api/ServerVariable.java @@ -5,7 +5,7 @@ /** * Representing a Server Variable for server URL template substitution. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ServerVariable { public String description; public String defaultValue; diff --git a/src/main/java/io/tiledb/cloud/rest_api/StringUtil.java b/src/main/java/io/tiledb/cloud/rest_api/StringUtil.java index c207942..0d82fe9 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/StringUtil.java +++ b/src/main/java/io/tiledb/cloud/rest_api/StringUtil.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.Iterator; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class StringUtil { /** * Check if the given array contains the given value (with case-insensitive comparison). diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/ArrayApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/ArrayApi.java index 0f6dcfb..6de559a 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/ArrayApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/ArrayApi.java @@ -96,7 +96,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for arrayActivityLog - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param start Start time of window of fetch logs, unix epoch in seconds (default: seven days ago) (optional) * @param end End time of window of fetch logs, unix epoch in seconds (default: current utc timestamp) (optional) @@ -114,7 +115,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call arrayActivityLogCall(String namespace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call arrayActivityLogCall(String workspace, String teamspace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -131,8 +132,9 @@ public okhttp3.Call arrayActivityLogCall(String namespace, String array, Integer Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/activity" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/activity" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -181,10 +183,15 @@ public okhttp3.Call arrayActivityLogCall(String namespace, String array, Integer } @SuppressWarnings("rawtypes") - private okhttp3.Call arrayActivityLogValidateBeforeCall(String namespace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling arrayActivityLog(Async)"); + private okhttp3.Call arrayActivityLogValidateBeforeCall(String workspace, String teamspace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling arrayActivityLog(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling arrayActivityLog(Async)"); } // verify the required parameter 'array' is set @@ -192,14 +199,15 @@ private okhttp3.Call arrayActivityLogValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'array' when calling arrayActivityLog(Async)"); } - return arrayActivityLogCall(namespace, array, start, end, eventTypes, taskId, hasTaskId, _callback); + return arrayActivityLogCall(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId, _callback); } /** * * get array activity logs - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param start Start time of window of fetch logs, unix epoch in seconds (default: seven days ago) (optional) * @param end End time of window of fetch logs, unix epoch in seconds (default: current utc timestamp) (optional) @@ -216,15 +224,16 @@ private okhttp3.Call arrayActivityLogValidateBeforeCall(String namespace, String 0 error response - */ - public List arrayActivityLog(String namespace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId) throws ApiException { - ApiResponse> localVarResp = arrayActivityLogWithHttpInfo(namespace, array, start, end, eventTypes, taskId, hasTaskId); + public List arrayActivityLog(String workspace, String teamspace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId) throws ApiException { + ApiResponse> localVarResp = arrayActivityLogWithHttpInfo(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId); return localVarResp.getData(); } /** * * get array activity logs - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param start Start time of window of fetch logs, unix epoch in seconds (default: seven days ago) (optional) * @param end End time of window of fetch logs, unix epoch in seconds (default: current utc timestamp) (optional) @@ -241,8 +250,8 @@ public List arrayActivityLog(String namespace, String array, I 0 error response - */ - public ApiResponse> arrayActivityLogWithHttpInfo(String namespace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId) throws ApiException { - okhttp3.Call localVarCall = arrayActivityLogValidateBeforeCall(namespace, array, start, end, eventTypes, taskId, hasTaskId, null); + public ApiResponse> arrayActivityLogWithHttpInfo(String workspace, String teamspace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId) throws ApiException { + okhttp3.Call localVarCall = arrayActivityLogValidateBeforeCall(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -250,7 +259,8 @@ public ApiResponse> arrayActivityLogWithHttpInfo(String n /** * (asynchronously) * get array activity logs - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param start Start time of window of fetch logs, unix epoch in seconds (default: seven days ago) (optional) * @param end End time of window of fetch logs, unix epoch in seconds (default: current utc timestamp) (optional) @@ -268,9 +278,9 @@ public ApiResponse> arrayActivityLogWithHttpInfo(String n 0 error response - */ - public okhttp3.Call arrayActivityLogAsync(String namespace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call arrayActivityLogAsync(String workspace, String teamspace, String array, Integer start, Integer end, String eventTypes, String taskId, Boolean hasTaskId, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = arrayActivityLogValidateBeforeCall(namespace, array, start, end, eventTypes, taskId, hasTaskId, _callback); + okhttp3.Call localVarCall = arrayActivityLogValidateBeforeCall(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -1378,8 +1388,9 @@ public okhttp3.Call arraysBrowserSharedSidebarGetAsync(List fileType, Li return localVarCall; } /** - * Build call for arraysNamespaceArrayEndTimestampsGet - * @param namespace namespace array is in (an organization name or user's username) (required) + * Build call for arraysWorkspaceTeamspaceArrayEndTimestampsGet + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1394,7 +1405,7 @@ public okhttp3.Call arraysBrowserSharedSidebarGetAsync(List fileType, Li 0 error response - */ - public okhttp3.Call arraysNamespaceArrayEndTimestampsGetCall(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call arraysWorkspaceTeamspaceArrayEndTimestampsGetCall(String workspace, String teamspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1411,8 +1422,9 @@ public okhttp3.Call arraysNamespaceArrayEndTimestampsGetCall(String namespace, S Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/end_timestamps" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/end_timestamps" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1449,25 +1461,31 @@ public okhttp3.Call arraysNamespaceArrayEndTimestampsGetCall(String namespace, S } @SuppressWarnings("rawtypes") - private okhttp3.Call arraysNamespaceArrayEndTimestampsGetValidateBeforeCall(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling arraysNamespaceArrayEndTimestampsGet(Async)"); + private okhttp3.Call arraysWorkspaceTeamspaceArrayEndTimestampsGetValidateBeforeCall(String workspace, String teamspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling arraysWorkspaceTeamspaceArrayEndTimestampsGet(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling arraysWorkspaceTeamspaceArrayEndTimestampsGet(Async)"); } // verify the required parameter 'array' is set if (array == null) { - throw new ApiException("Missing the required parameter 'array' when calling arraysNamespaceArrayEndTimestampsGet(Async)"); + throw new ApiException("Missing the required parameter 'array' when calling arraysWorkspaceTeamspaceArrayEndTimestampsGet(Async)"); } - return arraysNamespaceArrayEndTimestampsGetCall(namespace, array, page, perPage, _callback); + return arraysWorkspaceTeamspaceArrayEndTimestampsGetCall(workspace, teamspace, array, page, perPage, _callback); } /** * * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1481,15 +1499,16 @@ private okhttp3.Call arraysNamespaceArrayEndTimestampsGetValidateBeforeCall(Stri 0 error response - */ - public ArrayEndTimestampData arraysNamespaceArrayEndTimestampsGet(String namespace, String array, Integer page, Integer perPage) throws ApiException { - ApiResponse localVarResp = arraysNamespaceArrayEndTimestampsGetWithHttpInfo(namespace, array, page, perPage); + public ArrayEndTimestampData arraysWorkspaceTeamspaceArrayEndTimestampsGet(String workspace, String teamspace, String array, Integer page, Integer perPage) throws ApiException { + ApiResponse localVarResp = arraysWorkspaceTeamspaceArrayEndTimestampsGetWithHttpInfo(workspace, teamspace, array, page, perPage); return localVarResp.getData(); } /** * * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1503,8 +1522,8 @@ public ArrayEndTimestampData arraysNamespaceArrayEndTimestampsGet(String namespa 0 error response - */ - public ApiResponse arraysNamespaceArrayEndTimestampsGetWithHttpInfo(String namespace, String array, Integer page, Integer perPage) throws ApiException { - okhttp3.Call localVarCall = arraysNamespaceArrayEndTimestampsGetValidateBeforeCall(namespace, array, page, perPage, null); + public ApiResponse arraysWorkspaceTeamspaceArrayEndTimestampsGetWithHttpInfo(String workspace, String teamspace, String array, Integer page, Integer perPage) throws ApiException { + okhttp3.Call localVarCall = arraysWorkspaceTeamspaceArrayEndTimestampsGetValidateBeforeCall(workspace, teamspace, array, page, perPage, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1512,7 +1531,8 @@ public ApiResponse arraysNamespaceArrayEndTimestampsGetWi /** * (asynchronously) * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1527,16 +1547,17 @@ public ApiResponse arraysNamespaceArrayEndTimestampsGetWi 0 error response - */ - public okhttp3.Call arraysNamespaceArrayEndTimestampsGetAsync(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call arraysWorkspaceTeamspaceArrayEndTimestampsGetAsync(String workspace, String teamspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = arraysNamespaceArrayEndTimestampsGetValidateBeforeCall(namespace, array, page, perPage, _callback); + okhttp3.Call localVarCall = arraysWorkspaceTeamspaceArrayEndTimestampsGetValidateBeforeCall(workspace, teamspace, array, page, perPage, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for consolidateArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param consolidateRequest Consolidate Request (required) * @param _callback Callback for upload/download progress @@ -1550,7 +1571,7 @@ public okhttp3.Call arraysNamespaceArrayEndTimestampsGetAsync(String namespace, 0 error response - */ - public okhttp3.Call consolidateArrayCall(String namespace, String array, ArrayConsolidationRequest consolidateRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call consolidateArrayCall(String workspace, String teamspace, String array, ArrayConsolidationRequest consolidateRequest, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1567,8 +1588,9 @@ public okhttp3.Call consolidateArrayCall(String namespace, String array, ArrayCo Object localVarPostBody = consolidateRequest; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/consolidate" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/consolidate" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1598,10 +1620,15 @@ public okhttp3.Call consolidateArrayCall(String namespace, String array, ArrayCo } @SuppressWarnings("rawtypes") - private okhttp3.Call consolidateArrayValidateBeforeCall(String namespace, String array, ArrayConsolidationRequest consolidateRequest, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling consolidateArray(Async)"); + private okhttp3.Call consolidateArrayValidateBeforeCall(String workspace, String teamspace, String array, ArrayConsolidationRequest consolidateRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling consolidateArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling consolidateArray(Async)"); } // verify the required parameter 'array' is set @@ -1614,14 +1641,15 @@ private okhttp3.Call consolidateArrayValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'consolidateRequest' when calling consolidateArray(Async)"); } - return consolidateArrayCall(namespace, array, consolidateRequest, _callback); + return consolidateArrayCall(workspace, teamspace, array, consolidateRequest, _callback); } /** * * consolidate an array at a specified URI - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param consolidateRequest Consolidate Request (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1633,14 +1661,15 @@ private okhttp3.Call consolidateArrayValidateBeforeCall(String namespace, String 0 error response - */ - public void consolidateArray(String namespace, String array, ArrayConsolidationRequest consolidateRequest) throws ApiException { - consolidateArrayWithHttpInfo(namespace, array, consolidateRequest); + public void consolidateArray(String workspace, String teamspace, String array, ArrayConsolidationRequest consolidateRequest) throws ApiException { + consolidateArrayWithHttpInfo(workspace, teamspace, array, consolidateRequest); } /** * * consolidate an array at a specified URI - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param consolidateRequest Consolidate Request (required) * @return ApiResponse<Void> @@ -1653,15 +1682,16 @@ public void consolidateArray(String namespace, String array, ArrayConsolidationR 0 error response - */ - public ApiResponse consolidateArrayWithHttpInfo(String namespace, String array, ArrayConsolidationRequest consolidateRequest) throws ApiException { - okhttp3.Call localVarCall = consolidateArrayValidateBeforeCall(namespace, array, consolidateRequest, null); + public ApiResponse consolidateArrayWithHttpInfo(String workspace, String teamspace, String array, ArrayConsolidationRequest consolidateRequest) throws ApiException { + okhttp3.Call localVarCall = consolidateArrayValidateBeforeCall(workspace, teamspace, array, consolidateRequest, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * consolidate an array at a specified URI - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param consolidateRequest Consolidate Request (required) * @param _callback The callback to be executed when the API call finishes @@ -1675,15 +1705,16 @@ public ApiResponse consolidateArrayWithHttpInfo(String namespace, String a 0 error response - */ - public okhttp3.Call consolidateArrayAsync(String namespace, String array, ArrayConsolidationRequest consolidateRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call consolidateArrayAsync(String workspace, String teamspace, String array, ArrayConsolidationRequest consolidateRequest, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = consolidateArrayValidateBeforeCall(namespace, array, consolidateRequest, _callback); + okhttp3.Call localVarCall = consolidateArrayValidateBeforeCall(workspace, teamspace, array, consolidateRequest, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for createArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param arraySchema ArraySchema being created (required) @@ -1699,7 +1730,7 @@ public okhttp3.Call consolidateArrayAsync(String namespace, String array, ArrayC 0 error response - */ - public okhttp3.Call createArrayCall(String namespace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createArrayCall(String workspace, String teamspace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1716,8 +1747,9 @@ public okhttp3.Call createArrayCall(String namespace, String array, String conte Object localVarPostBody = arraySchema; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1755,10 +1787,15 @@ public okhttp3.Call createArrayCall(String namespace, String array, String conte } @SuppressWarnings("rawtypes") - private okhttp3.Call createArrayValidateBeforeCall(String namespace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling createArray(Async)"); + private okhttp3.Call createArrayValidateBeforeCall(String workspace, String teamspace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling createArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling createArray(Async)"); } // verify the required parameter 'array' is set @@ -1776,14 +1813,15 @@ private okhttp3.Call createArrayValidateBeforeCall(String namespace, String arra throw new ApiException("Missing the required parameter 'arraySchema' when calling createArray(Async)"); } - return createArrayCall(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); + return createArrayCall(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); } /** * * create a array schema at a specified URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param arraySchema ArraySchema being created (required) @@ -1797,14 +1835,15 @@ private okhttp3.Call createArrayValidateBeforeCall(String namespace, String arra 0 error response - */ - public void createArray(String namespace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { - createArrayWithHttpInfo(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); + public void createArray(String workspace, String teamspace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { + createArrayWithHttpInfo(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); } /** * * create a array schema at a specified URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param arraySchema ArraySchema being created (required) @@ -1819,15 +1858,16 @@ public void createArray(String namespace, String array, String contentType, Arra 0 error response - */ - public ApiResponse createArrayWithHttpInfo(String namespace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { - okhttp3.Call localVarCall = createArrayValidateBeforeCall(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, null); + public ApiResponse createArrayWithHttpInfo(String workspace, String teamspace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { + okhttp3.Call localVarCall = createArrayValidateBeforeCall(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * create a array schema at a specified URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param arraySchema ArraySchema being created (required) @@ -1843,15 +1883,16 @@ public ApiResponse createArrayWithHttpInfo(String namespace, String array, 0 error response - */ - public okhttp3.Call createArrayAsync(String namespace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createArrayAsync(String workspace, String teamspace, String array, String contentType, ArraySchema arraySchema, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = createArrayValidateBeforeCall(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); + okhttp3.Call localVarCall = createArrayValidateBeforeCall(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deleteArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param _callback Callback for upload/download progress @@ -1865,7 +1906,7 @@ public okhttp3.Call createArrayAsync(String namespace, String array, String cont 0 error response - */ - public okhttp3.Call deleteArrayCall(String namespace, String array, String contentType, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteArrayCall(String workspace, String teamspace, String array, String contentType, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1882,8 +1923,9 @@ public okhttp3.Call deleteArrayCall(String namespace, String array, String conte Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1916,10 +1958,15 @@ public okhttp3.Call deleteArrayCall(String namespace, String array, String conte } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteArrayValidateBeforeCall(String namespace, String array, String contentType, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteArray(Async)"); + private okhttp3.Call deleteArrayValidateBeforeCall(String workspace, String teamspace, String array, String contentType, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteArray(Async)"); } // verify the required parameter 'array' is set @@ -1932,14 +1979,15 @@ private okhttp3.Call deleteArrayValidateBeforeCall(String namespace, String arra throw new ApiException("Missing the required parameter 'contentType' when calling deleteArray(Async)"); } - return deleteArrayCall(namespace, array, contentType, _callback); + return deleteArrayCall(workspace, teamspace, array, contentType, _callback); } /** * * delete a array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1951,14 +1999,15 @@ private okhttp3.Call deleteArrayValidateBeforeCall(String namespace, String arra 0 error response - */ - public void deleteArray(String namespace, String array, String contentType) throws ApiException { - deleteArrayWithHttpInfo(namespace, array, contentType); + public void deleteArray(String workspace, String teamspace, String array, String contentType) throws ApiException { + deleteArrayWithHttpInfo(workspace, teamspace, array, contentType); } /** * * delete a array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @return ApiResponse<Void> @@ -1971,15 +2020,16 @@ public void deleteArray(String namespace, String array, String contentType) thro 0 error response - */ - public ApiResponse deleteArrayWithHttpInfo(String namespace, String array, String contentType) throws ApiException { - okhttp3.Call localVarCall = deleteArrayValidateBeforeCall(namespace, array, contentType, null); + public ApiResponse deleteArrayWithHttpInfo(String workspace, String teamspace, String array, String contentType) throws ApiException { + okhttp3.Call localVarCall = deleteArrayValidateBeforeCall(workspace, teamspace, array, contentType, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * delete a array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param _callback The callback to be executed when the API call finishes @@ -1993,15 +2043,16 @@ public ApiResponse deleteArrayWithHttpInfo(String namespace, String array, 0 error response - */ - public okhttp3.Call deleteArrayAsync(String namespace, String array, String contentType, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteArrayAsync(String workspace, String teamspace, String array, String contentType, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteArrayValidateBeforeCall(namespace, array, contentType, _callback); + okhttp3.Call localVarCall = deleteArrayValidateBeforeCall(workspace, teamspace, array, contentType, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deregisterArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -2014,7 +2065,7 @@ public okhttp3.Call deleteArrayAsync(String namespace, String array, String cont 0 error response - */ - public okhttp3.Call deregisterArrayCall(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deregisterArrayCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2031,8 +2082,9 @@ public okhttp3.Call deregisterArrayCall(String namespace, String array, final Ap Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/deregister" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/deregister" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -2061,10 +2113,15 @@ public okhttp3.Call deregisterArrayCall(String namespace, String array, final Ap } @SuppressWarnings("rawtypes") - private okhttp3.Call deregisterArrayValidateBeforeCall(String namespace, String array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deregisterArray(Async)"); + private okhttp3.Call deregisterArrayValidateBeforeCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deregisterArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deregisterArray(Async)"); } // verify the required parameter 'array' is set @@ -2072,14 +2129,15 @@ private okhttp3.Call deregisterArrayValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'array' when calling deregisterArray(Async)"); } - return deregisterArrayCall(namespace, array, _callback); + return deregisterArrayCall(workspace, teamspace, array, _callback); } /** * * deregister a array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -2090,14 +2148,15 @@ private okhttp3.Call deregisterArrayValidateBeforeCall(String namespace, String 0 error response - */ - public void deregisterArray(String namespace, String array) throws ApiException { - deregisterArrayWithHttpInfo(namespace, array); + public void deregisterArray(String workspace, String teamspace, String array) throws ApiException { + deregisterArrayWithHttpInfo(workspace, teamspace, array); } /** * * deregister a array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -2109,15 +2168,16 @@ public void deregisterArray(String namespace, String array) throws ApiException 0 error response - */ - public ApiResponse deregisterArrayWithHttpInfo(String namespace, String array) throws ApiException { - okhttp3.Call localVarCall = deregisterArrayValidateBeforeCall(namespace, array, null); + public ApiResponse deregisterArrayWithHttpInfo(String workspace, String teamspace, String array) throws ApiException { + okhttp3.Call localVarCall = deregisterArrayValidateBeforeCall(workspace, teamspace, array, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * deregister a array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -2130,15 +2190,16 @@ public ApiResponse deregisterArrayWithHttpInfo(String namespace, String ar 0 error response - */ - public okhttp3.Call deregisterArrayAsync(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deregisterArrayAsync(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deregisterArrayValidateBeforeCall(namespace, array, _callback); + okhttp3.Call localVarCall = deregisterArrayValidateBeforeCall(workspace, teamspace, array, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for fragmentInfo - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param fragmentInfoRequest ArraySchema being created (required) @@ -2152,7 +2213,7 @@ public okhttp3.Call deregisterArrayAsync(String namespace, String array, final A 0 error response - */ - public okhttp3.Call fragmentInfoCall(String namespace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call fragmentInfoCall(String workspace, String teamspace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2169,8 +2230,9 @@ public okhttp3.Call fragmentInfoCall(String namespace, String array, String cont Object localVarPostBody = fragmentInfoRequest; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/fragment_info" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/fragment_info" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -2204,10 +2266,15 @@ public okhttp3.Call fragmentInfoCall(String namespace, String array, String cont } @SuppressWarnings("rawtypes") - private okhttp3.Call fragmentInfoValidateBeforeCall(String namespace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling fragmentInfo(Async)"); + private okhttp3.Call fragmentInfoValidateBeforeCall(String workspace, String teamspace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling fragmentInfo(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling fragmentInfo(Async)"); } // verify the required parameter 'array' is set @@ -2225,14 +2292,15 @@ private okhttp3.Call fragmentInfoValidateBeforeCall(String namespace, String arr throw new ApiException("Missing the required parameter 'fragmentInfoRequest' when calling fragmentInfo(Async)"); } - return fragmentInfoCall(namespace, array, contentType, fragmentInfoRequest, _callback); + return fragmentInfoCall(workspace, teamspace, array, contentType, fragmentInfoRequest, _callback); } /** * * fetch an array's fragment info - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param fragmentInfoRequest ArraySchema being created (required) @@ -2245,15 +2313,16 @@ private okhttp3.Call fragmentInfoValidateBeforeCall(String namespace, String arr 0 error response - */ - public FragmentInfo fragmentInfo(String namespace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest) throws ApiException { - ApiResponse localVarResp = fragmentInfoWithHttpInfo(namespace, array, contentType, fragmentInfoRequest); + public FragmentInfo fragmentInfo(String workspace, String teamspace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest) throws ApiException { + ApiResponse localVarResp = fragmentInfoWithHttpInfo(workspace, teamspace, array, contentType, fragmentInfoRequest); return localVarResp.getData(); } /** * * fetch an array's fragment info - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param fragmentInfoRequest ArraySchema being created (required) @@ -2266,8 +2335,8 @@ public FragmentInfo fragmentInfo(String namespace, String array, String contentT 0 error response - */ - public ApiResponse fragmentInfoWithHttpInfo(String namespace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest) throws ApiException { - okhttp3.Call localVarCall = fragmentInfoValidateBeforeCall(namespace, array, contentType, fragmentInfoRequest, null); + public ApiResponse fragmentInfoWithHttpInfo(String workspace, String teamspace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest) throws ApiException { + okhttp3.Call localVarCall = fragmentInfoValidateBeforeCall(workspace, teamspace, array, contentType, fragmentInfoRequest, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -2275,7 +2344,8 @@ public ApiResponse fragmentInfoWithHttpInfo(String namespace, Stri /** * (asynchronously) * fetch an array's fragment info - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param fragmentInfoRequest ArraySchema being created (required) @@ -2289,16 +2359,17 @@ public ApiResponse fragmentInfoWithHttpInfo(String namespace, Stri 0 error response - */ - public okhttp3.Call fragmentInfoAsync(String namespace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call fragmentInfoAsync(String workspace, String teamspace, String array, String contentType, FragmentInfoRequest fragmentInfoRequest, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = fragmentInfoValidateBeforeCall(namespace, array, contentType, fragmentInfoRequest, _callback); + okhttp3.Call localVarCall = fragmentInfoValidateBeforeCall(workspace, teamspace, array, contentType, fragmentInfoRequest, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getActivityLogById - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param id ID of the activity (required) * @param _callback Callback for upload/download progress @@ -2312,7 +2383,7 @@ public okhttp3.Call fragmentInfoAsync(String namespace, String array, String con 0 error response - */ - public okhttp3.Call getActivityLogByIdCall(String namespace, String array, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getActivityLogByIdCall(String workspace, String teamspace, String array, String id, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2329,8 +2400,9 @@ public okhttp3.Call getActivityLogByIdCall(String namespace, String array, Strin Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/activity/{id}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/activity/{id}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); @@ -2360,10 +2432,15 @@ public okhttp3.Call getActivityLogByIdCall(String namespace, String array, Strin } @SuppressWarnings("rawtypes") - private okhttp3.Call getActivityLogByIdValidateBeforeCall(String namespace, String array, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getActivityLogById(Async)"); + private okhttp3.Call getActivityLogByIdValidateBeforeCall(String workspace, String teamspace, String array, String id, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getActivityLogById(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getActivityLogById(Async)"); } // verify the required parameter 'array' is set @@ -2376,14 +2453,15 @@ private okhttp3.Call getActivityLogByIdValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'id' when calling getActivityLogById(Async)"); } - return getActivityLogByIdCall(namespace, array, id, _callback); + return getActivityLogByIdCall(workspace, teamspace, array, id, _callback); } /** * * get activity log by ID - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param id ID of the activity (required) * @return ArrayActivityLog @@ -2396,15 +2474,16 @@ private okhttp3.Call getActivityLogByIdValidateBeforeCall(String namespace, Stri 0 error response - */ - public ArrayActivityLog getActivityLogById(String namespace, String array, String id) throws ApiException { - ApiResponse localVarResp = getActivityLogByIdWithHttpInfo(namespace, array, id); + public ArrayActivityLog getActivityLogById(String workspace, String teamspace, String array, String id) throws ApiException { + ApiResponse localVarResp = getActivityLogByIdWithHttpInfo(workspace, teamspace, array, id); return localVarResp.getData(); } /** * * get activity log by ID - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param id ID of the activity (required) * @return ApiResponse<ArrayActivityLog> @@ -2417,8 +2496,8 @@ public ArrayActivityLog getActivityLogById(String namespace, String array, Strin 0 error response - */ - public ApiResponse getActivityLogByIdWithHttpInfo(String namespace, String array, String id) throws ApiException { - okhttp3.Call localVarCall = getActivityLogByIdValidateBeforeCall(namespace, array, id, null); + public ApiResponse getActivityLogByIdWithHttpInfo(String workspace, String teamspace, String array, String id) throws ApiException { + okhttp3.Call localVarCall = getActivityLogByIdValidateBeforeCall(workspace, teamspace, array, id, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -2426,7 +2505,8 @@ public ApiResponse getActivityLogByIdWithHttpInfo(String names /** * (asynchronously) * get activity log by ID - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param id ID of the activity (required) * @param _callback The callback to be executed when the API call finishes @@ -2440,9 +2520,9 @@ public ApiResponse getActivityLogByIdWithHttpInfo(String names 0 error response - */ - public okhttp3.Call getActivityLogByIdAsync(String namespace, String array, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getActivityLogByIdAsync(String workspace, String teamspace, String array, String id, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getActivityLogByIdValidateBeforeCall(namespace, array, id, _callback); + okhttp3.Call localVarCall = getActivityLogByIdValidateBeforeCall(workspace, teamspace, array, id, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -2578,7 +2658,8 @@ public okhttp3.Call getAllArrayMetadataAsync(String publicShare, final ApiCallba } /** * Build call for getArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param _callback Callback for upload/download progress @@ -2592,7 +2673,7 @@ public okhttp3.Call getAllArrayMetadataAsync(String publicShare, final ApiCallba 0 error response - */ - public okhttp3.Call getArrayCall(String namespace, String array, String contentType, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayCall(String workspace, String teamspace, String array, String contentType, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2609,8 +2690,9 @@ public okhttp3.Call getArrayCall(String namespace, String array, String contentT Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -2644,10 +2726,15 @@ public okhttp3.Call getArrayCall(String namespace, String array, String contentT } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayValidateBeforeCall(String namespace, String array, String contentType, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArray(Async)"); + private okhttp3.Call getArrayValidateBeforeCall(String workspace, String teamspace, String array, String contentType, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArray(Async)"); } // verify the required parameter 'array' is set @@ -2660,14 +2747,15 @@ private okhttp3.Call getArrayValidateBeforeCall(String namespace, String array, throw new ApiException("Missing the required parameter 'contentType' when calling getArray(Async)"); } - return getArrayCall(namespace, array, contentType, _callback); + return getArrayCall(workspace, teamspace, array, contentType, _callback); } /** * * get an ArraySchema using a url encoded uri - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @return ArraySchema @@ -2680,15 +2768,16 @@ private okhttp3.Call getArrayValidateBeforeCall(String namespace, String array, 0 error response - */ - public ArraySchema getArray(String namespace, String array, String contentType) throws ApiException { - ApiResponse localVarResp = getArrayWithHttpInfo(namespace, array, contentType); + public ArraySchema getArray(String workspace, String teamspace, String array, String contentType) throws ApiException { + ApiResponse localVarResp = getArrayWithHttpInfo(workspace, teamspace, array, contentType); return localVarResp.getData(); } /** * * get an ArraySchema using a url encoded uri - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @return ApiResponse<ArraySchema> @@ -2701,8 +2790,8 @@ public ArraySchema getArray(String namespace, String array, String contentType) 0 error response - */ - public ApiResponse getArrayWithHttpInfo(String namespace, String array, String contentType) throws ApiException { - okhttp3.Call localVarCall = getArrayValidateBeforeCall(namespace, array, contentType, null); + public ApiResponse getArrayWithHttpInfo(String workspace, String teamspace, String array, String contentType) throws ApiException { + okhttp3.Call localVarCall = getArrayValidateBeforeCall(workspace, teamspace, array, contentType, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -2710,7 +2799,8 @@ public ApiResponse getArrayWithHttpInfo(String namespace, String ar /** * (asynchronously) * get an ArraySchema using a url encoded uri - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param _callback The callback to be executed when the API call finishes @@ -2724,16 +2814,17 @@ public ApiResponse getArrayWithHttpInfo(String namespace, String ar 0 error response - */ - public okhttp3.Call getArrayAsync(String namespace, String array, String contentType, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayAsync(String workspace, String teamspace, String array, String contentType, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayValidateBeforeCall(namespace, array, contentType, _callback); + okhttp3.Call localVarCall = getArrayValidateBeforeCall(workspace, teamspace, array, contentType, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArrayMaxBufferSizes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param subarray CSV string of subarray to get max buffer sizes for (required) * @param contentType Content Type of input and return mime (required) @@ -2749,7 +2840,7 @@ public okhttp3.Call getArrayAsync(String namespace, String array, String content 0 error response - */ - public okhttp3.Call getArrayMaxBufferSizesCall(String namespace, String array, String subarray, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMaxBufferSizesCall(String workspace, String teamspace, String array, String subarray, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2766,8 +2857,9 @@ public okhttp3.Call getArrayMaxBufferSizesCall(String namespace, String array, S Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/max_buffer_sizes" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/max_buffer_sizes" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -2808,10 +2900,15 @@ public okhttp3.Call getArrayMaxBufferSizesCall(String namespace, String array, S } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayMaxBufferSizesValidateBeforeCall(String namespace, String array, String subarray, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayMaxBufferSizes(Async)"); + private okhttp3.Call getArrayMaxBufferSizesValidateBeforeCall(String workspace, String teamspace, String array, String subarray, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayMaxBufferSizes(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayMaxBufferSizes(Async)"); } // verify the required parameter 'array' is set @@ -2829,14 +2926,15 @@ private okhttp3.Call getArrayMaxBufferSizesValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'contentType' when calling getArrayMaxBufferSizes(Async)"); } - return getArrayMaxBufferSizesCall(namespace, array, subarray, contentType, xPayer, _callback); + return getArrayMaxBufferSizesCall(workspace, teamspace, array, subarray, contentType, xPayer, _callback); } /** * * get the max buffer sizes of an array for a subarray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param subarray CSV string of subarray to get max buffer sizes for (required) * @param contentType Content Type of input and return mime (required) @@ -2851,15 +2949,16 @@ private okhttp3.Call getArrayMaxBufferSizesValidateBeforeCall(String namespace, 0 error response - */ - public MaxBufferSizes getArrayMaxBufferSizes(String namespace, String array, String subarray, String contentType, String xPayer) throws ApiException { - ApiResponse localVarResp = getArrayMaxBufferSizesWithHttpInfo(namespace, array, subarray, contentType, xPayer); + public MaxBufferSizes getArrayMaxBufferSizes(String workspace, String teamspace, String array, String subarray, String contentType, String xPayer) throws ApiException { + ApiResponse localVarResp = getArrayMaxBufferSizesWithHttpInfo(workspace, teamspace, array, subarray, contentType, xPayer); return localVarResp.getData(); } /** * * get the max buffer sizes of an array for a subarray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param subarray CSV string of subarray to get max buffer sizes for (required) * @param contentType Content Type of input and return mime (required) @@ -2874,8 +2973,8 @@ public MaxBufferSizes getArrayMaxBufferSizes(String namespace, String array, Str 0 error response - */ - public ApiResponse getArrayMaxBufferSizesWithHttpInfo(String namespace, String array, String subarray, String contentType, String xPayer) throws ApiException { - okhttp3.Call localVarCall = getArrayMaxBufferSizesValidateBeforeCall(namespace, array, subarray, contentType, xPayer, null); + public ApiResponse getArrayMaxBufferSizesWithHttpInfo(String workspace, String teamspace, String array, String subarray, String contentType, String xPayer) throws ApiException { + okhttp3.Call localVarCall = getArrayMaxBufferSizesValidateBeforeCall(workspace, teamspace, array, subarray, contentType, xPayer, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -2883,7 +2982,8 @@ public ApiResponse getArrayMaxBufferSizesWithHttpInfo(String nam /** * (asynchronously) * get the max buffer sizes of an array for a subarray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param subarray CSV string of subarray to get max buffer sizes for (required) * @param contentType Content Type of input and return mime (required) @@ -2899,16 +2999,17 @@ public ApiResponse getArrayMaxBufferSizesWithHttpInfo(String nam 0 error response - */ - public okhttp3.Call getArrayMaxBufferSizesAsync(String namespace, String array, String subarray, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMaxBufferSizesAsync(String workspace, String teamspace, String array, String subarray, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayMaxBufferSizesValidateBeforeCall(namespace, array, subarray, contentType, xPayer, _callback); + okhttp3.Call localVarCall = getArrayMaxBufferSizesValidateBeforeCall(workspace, teamspace, array, subarray, contentType, xPayer, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArrayMetaDataJson - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param length (optional) limit character length of returned values (optional) * @param endTimestamp Milliseconds since Unix epoch, metadata will use open_at functionality to open array at the specific timestamp (optional) @@ -2923,7 +3024,7 @@ public okhttp3.Call getArrayMaxBufferSizesAsync(String namespace, String array, 0 error response - */ - public okhttp3.Call getArrayMetaDataJsonCall(String namespace, String array, Integer length, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMetaDataJsonCall(String workspace, String teamspace, String array, Integer length, Integer endTimestamp, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2940,8 +3041,9 @@ public okhttp3.Call getArrayMetaDataJsonCall(String namespace, String array, Int Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/metadata_json" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/metadata_json" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -2978,10 +3080,15 @@ public okhttp3.Call getArrayMetaDataJsonCall(String namespace, String array, Int } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayMetaDataJsonValidateBeforeCall(String namespace, String array, Integer length, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayMetaDataJson(Async)"); + private okhttp3.Call getArrayMetaDataJsonValidateBeforeCall(String workspace, String teamspace, String array, Integer length, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayMetaDataJson(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayMetaDataJson(Async)"); } // verify the required parameter 'array' is set @@ -2989,14 +3096,15 @@ private okhttp3.Call getArrayMetaDataJsonValidateBeforeCall(String namespace, St throw new ApiException("Missing the required parameter 'array' when calling getArrayMetaDataJson(Async)"); } - return getArrayMetaDataJsonCall(namespace, array, length, endTimestamp, _callback); + return getArrayMetaDataJsonCall(workspace, teamspace, array, length, endTimestamp, _callback); } /** * * get metadata from the array in JSON format - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param length (optional) limit character length of returned values (optional) * @param endTimestamp Milliseconds since Unix epoch, metadata will use open_at functionality to open array at the specific timestamp (optional) @@ -3010,15 +3118,16 @@ private okhttp3.Call getArrayMetaDataJsonValidateBeforeCall(String namespace, St 0 error response - */ - public Map getArrayMetaDataJson(String namespace, String array, Integer length, Integer endTimestamp) throws ApiException { - ApiResponse> localVarResp = getArrayMetaDataJsonWithHttpInfo(namespace, array, length, endTimestamp); + public Map getArrayMetaDataJson(String workspace, String teamspace, String array, Integer length, Integer endTimestamp) throws ApiException { + ApiResponse> localVarResp = getArrayMetaDataJsonWithHttpInfo(workspace, teamspace, array, length, endTimestamp); return localVarResp.getData(); } /** * * get metadata from the array in JSON format - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param length (optional) limit character length of returned values (optional) * @param endTimestamp Milliseconds since Unix epoch, metadata will use open_at functionality to open array at the specific timestamp (optional) @@ -3032,8 +3141,8 @@ public Map getArrayMetaDataJson(String namespace, String array, 0 error response - */ - public ApiResponse> getArrayMetaDataJsonWithHttpInfo(String namespace, String array, Integer length, Integer endTimestamp) throws ApiException { - okhttp3.Call localVarCall = getArrayMetaDataJsonValidateBeforeCall(namespace, array, length, endTimestamp, null); + public ApiResponse> getArrayMetaDataJsonWithHttpInfo(String workspace, String teamspace, String array, Integer length, Integer endTimestamp) throws ApiException { + okhttp3.Call localVarCall = getArrayMetaDataJsonValidateBeforeCall(workspace, teamspace, array, length, endTimestamp, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3041,7 +3150,8 @@ public ApiResponse> getArrayMetaDataJsonWithHttpInfo(String /** * (asynchronously) * get metadata from the array in JSON format - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param length (optional) limit character length of returned values (optional) * @param endTimestamp Milliseconds since Unix epoch, metadata will use open_at functionality to open array at the specific timestamp (optional) @@ -3056,16 +3166,17 @@ public ApiResponse> getArrayMetaDataJsonWithHttpInfo(String 0 error response - */ - public okhttp3.Call getArrayMetaDataJsonAsync(String namespace, String array, Integer length, Integer endTimestamp, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getArrayMetaDataJsonAsync(String workspace, String teamspace, String array, Integer length, Integer endTimestamp, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayMetaDataJsonValidateBeforeCall(namespace, array, length, endTimestamp, _callback); + okhttp3.Call localVarCall = getArrayMetaDataJsonValidateBeforeCall(workspace, teamspace, array, length, endTimestamp, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArrayMetadata - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -3078,7 +3189,7 @@ public okhttp3.Call getArrayMetaDataJsonAsync(String namespace, String array, In 0 error response - */ - public okhttp3.Call getArrayMetadataCall(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMetadataCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3095,8 +3206,9 @@ public okhttp3.Call getArrayMetadataCall(String namespace, String array, final A Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/metadata" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/metadata" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -3125,10 +3237,15 @@ public okhttp3.Call getArrayMetadataCall(String namespace, String array, final A } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayMetadataValidateBeforeCall(String namespace, String array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayMetadata(Async)"); + private okhttp3.Call getArrayMetadataValidateBeforeCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayMetadata(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayMetadata(Async)"); } // verify the required parameter 'array' is set @@ -3136,14 +3253,15 @@ private okhttp3.Call getArrayMetadataValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'array' when calling getArrayMetadata(Async)"); } - return getArrayMetadataCall(namespace, array, _callback); + return getArrayMetadataCall(workspace, teamspace, array, _callback); } /** * * get metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ArrayInfo * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3155,15 +3273,16 @@ private okhttp3.Call getArrayMetadataValidateBeforeCall(String namespace, String 0 error response - */ - public ArrayInfo getArrayMetadata(String namespace, String array) throws ApiException { - ApiResponse localVarResp = getArrayMetadataWithHttpInfo(namespace, array); + public ArrayInfo getArrayMetadata(String workspace, String teamspace, String array) throws ApiException { + ApiResponse localVarResp = getArrayMetadataWithHttpInfo(workspace, teamspace, array); return localVarResp.getData(); } /** * * get metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ApiResponse<ArrayInfo> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3175,8 +3294,8 @@ public ArrayInfo getArrayMetadata(String namespace, String array) throws ApiExce 0 error response - */ - public ApiResponse getArrayMetadataWithHttpInfo(String namespace, String array) throws ApiException { - okhttp3.Call localVarCall = getArrayMetadataValidateBeforeCall(namespace, array, null); + public ApiResponse getArrayMetadataWithHttpInfo(String workspace, String teamspace, String array) throws ApiException { + okhttp3.Call localVarCall = getArrayMetadataValidateBeforeCall(workspace, teamspace, array, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3184,7 +3303,8 @@ public ApiResponse getArrayMetadataWithHttpInfo(String namespace, Str /** * (asynchronously) * get metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -3197,16 +3317,17 @@ public ApiResponse getArrayMetadataWithHttpInfo(String namespace, Str 0 error response - */ - public okhttp3.Call getArrayMetadataAsync(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMetadataAsync(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayMetadataValidateBeforeCall(namespace, array, _callback); + okhttp3.Call localVarCall = getArrayMetadataValidateBeforeCall(workspace, teamspace, array, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArrayMetadataCapnp - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -3219,7 +3340,7 @@ public okhttp3.Call getArrayMetadataAsync(String namespace, String array, final 0 error response - */ - public okhttp3.Call getArrayMetadataCapnpCall(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMetadataCapnpCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3236,8 +3357,9 @@ public okhttp3.Call getArrayMetadataCapnpCall(String namespace, String array, fi Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/array_metadata" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/array_metadata" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -3267,10 +3389,15 @@ public okhttp3.Call getArrayMetadataCapnpCall(String namespace, String array, fi } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayMetadataCapnpValidateBeforeCall(String namespace, String array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayMetadataCapnp(Async)"); + private okhttp3.Call getArrayMetadataCapnpValidateBeforeCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayMetadataCapnp(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayMetadataCapnp(Async)"); } // verify the required parameter 'array' is set @@ -3278,14 +3405,15 @@ private okhttp3.Call getArrayMetadataCapnpValidateBeforeCall(String namespace, S throw new ApiException("Missing the required parameter 'array' when calling getArrayMetadataCapnp(Async)"); } - return getArrayMetadataCapnpCall(namespace, array, _callback); + return getArrayMetadataCapnpCall(workspace, teamspace, array, _callback); } /** * * get metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ArrayMetadata * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3297,15 +3425,16 @@ private okhttp3.Call getArrayMetadataCapnpValidateBeforeCall(String namespace, S 0 error response - */ - public ArrayMetadata getArrayMetadataCapnp(String namespace, String array) throws ApiException { - ApiResponse localVarResp = getArrayMetadataCapnpWithHttpInfo(namespace, array); + public ArrayMetadata getArrayMetadataCapnp(String workspace, String teamspace, String array) throws ApiException { + ApiResponse localVarResp = getArrayMetadataCapnpWithHttpInfo(workspace, teamspace, array); return localVarResp.getData(); } /** * * get metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ApiResponse<ArrayMetadata> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3317,8 +3446,8 @@ public ArrayMetadata getArrayMetadataCapnp(String namespace, String array) throw 0 error response - */ - public ApiResponse getArrayMetadataCapnpWithHttpInfo(String namespace, String array) throws ApiException { - okhttp3.Call localVarCall = getArrayMetadataCapnpValidateBeforeCall(namespace, array, null); + public ApiResponse getArrayMetadataCapnpWithHttpInfo(String workspace, String teamspace, String array) throws ApiException { + okhttp3.Call localVarCall = getArrayMetadataCapnpValidateBeforeCall(workspace, teamspace, array, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3326,7 +3455,8 @@ public ApiResponse getArrayMetadataCapnpWithHttpInfo(String names /** * (asynchronously) * get metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -3339,16 +3469,17 @@ public ApiResponse getArrayMetadataCapnpWithHttpInfo(String names 0 error response - */ - public okhttp3.Call getArrayMetadataCapnpAsync(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayMetadataCapnpAsync(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayMetadataCapnpValidateBeforeCall(namespace, array, _callback); + okhttp3.Call localVarCall = getArrayMetadataCapnpValidateBeforeCall(workspace, teamspace, array, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArrayNonEmptyDomain - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -3363,7 +3494,7 @@ public okhttp3.Call getArrayMetadataCapnpAsync(String namespace, String array, f 0 error response - */ - public okhttp3.Call getArrayNonEmptyDomainCall(String namespace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayNonEmptyDomainCall(String workspace, String teamspace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3380,8 +3511,9 @@ public okhttp3.Call getArrayNonEmptyDomainCall(String namespace, String array, S Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/non_empty_domain" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/non_empty_domain" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -3418,10 +3550,15 @@ public okhttp3.Call getArrayNonEmptyDomainCall(String namespace, String array, S } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayNonEmptyDomainValidateBeforeCall(String namespace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayNonEmptyDomain(Async)"); + private okhttp3.Call getArrayNonEmptyDomainValidateBeforeCall(String workspace, String teamspace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayNonEmptyDomain(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayNonEmptyDomain(Async)"); } // verify the required parameter 'array' is set @@ -3434,14 +3571,15 @@ private okhttp3.Call getArrayNonEmptyDomainValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'contentType' when calling getArrayNonEmptyDomain(Async)"); } - return getArrayNonEmptyDomainCall(namespace, array, contentType, xPayer, _callback); + return getArrayNonEmptyDomainCall(workspace, teamspace, array, contentType, xPayer, _callback); } /** * * get the non empty domain of an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -3455,15 +3593,16 @@ private okhttp3.Call getArrayNonEmptyDomainValidateBeforeCall(String namespace, 0 error response - */ - public NonEmptyDomain getArrayNonEmptyDomain(String namespace, String array, String contentType, String xPayer) throws ApiException { - ApiResponse localVarResp = getArrayNonEmptyDomainWithHttpInfo(namespace, array, contentType, xPayer); + public NonEmptyDomain getArrayNonEmptyDomain(String workspace, String teamspace, String array, String contentType, String xPayer) throws ApiException { + ApiResponse localVarResp = getArrayNonEmptyDomainWithHttpInfo(workspace, teamspace, array, contentType, xPayer); return localVarResp.getData(); } /** * * get the non empty domain of an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -3477,8 +3616,8 @@ public NonEmptyDomain getArrayNonEmptyDomain(String namespace, String array, Str 0 error response - */ - public ApiResponse getArrayNonEmptyDomainWithHttpInfo(String namespace, String array, String contentType, String xPayer) throws ApiException { - okhttp3.Call localVarCall = getArrayNonEmptyDomainValidateBeforeCall(namespace, array, contentType, xPayer, null); + public ApiResponse getArrayNonEmptyDomainWithHttpInfo(String workspace, String teamspace, String array, String contentType, String xPayer) throws ApiException { + okhttp3.Call localVarCall = getArrayNonEmptyDomainValidateBeforeCall(workspace, teamspace, array, contentType, xPayer, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3486,7 +3625,8 @@ public ApiResponse getArrayNonEmptyDomainWithHttpInfo(String nam /** * (asynchronously) * get the non empty domain of an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -3501,16 +3641,17 @@ public ApiResponse getArrayNonEmptyDomainWithHttpInfo(String nam 0 error response - */ - public okhttp3.Call getArrayNonEmptyDomainAsync(String namespace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayNonEmptyDomainAsync(String workspace, String teamspace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayNonEmptyDomainValidateBeforeCall(namespace, array, contentType, xPayer, _callback); + okhttp3.Call localVarCall = getArrayNonEmptyDomainValidateBeforeCall(workspace, teamspace, array, contentType, xPayer, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArrayNonEmptyDomainJson - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -3523,7 +3664,7 @@ public okhttp3.Call getArrayNonEmptyDomainAsync(String namespace, String array, 0 error response - */ - public okhttp3.Call getArrayNonEmptyDomainJsonCall(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayNonEmptyDomainJsonCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3540,8 +3681,9 @@ public okhttp3.Call getArrayNonEmptyDomainJsonCall(String namespace, String arra Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/non_empty_domain_json" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/non_empty_domain_json" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -3570,10 +3712,15 @@ public okhttp3.Call getArrayNonEmptyDomainJsonCall(String namespace, String arra } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayNonEmptyDomainJsonValidateBeforeCall(String namespace, String array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayNonEmptyDomainJson(Async)"); + private okhttp3.Call getArrayNonEmptyDomainJsonValidateBeforeCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayNonEmptyDomainJson(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayNonEmptyDomainJson(Async)"); } // verify the required parameter 'array' is set @@ -3581,14 +3728,15 @@ private okhttp3.Call getArrayNonEmptyDomainJsonValidateBeforeCall(String namespa throw new ApiException("Missing the required parameter 'array' when calling getArrayNonEmptyDomainJson(Async)"); } - return getArrayNonEmptyDomainJsonCall(namespace, array, _callback); + return getArrayNonEmptyDomainJsonCall(workspace, teamspace, array, _callback); } /** * * get non-empty domain from the array in json format - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return Map<String, Object> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3600,15 +3748,16 @@ private okhttp3.Call getArrayNonEmptyDomainJsonValidateBeforeCall(String namespa 0 error response - */ - public Map getArrayNonEmptyDomainJson(String namespace, String array) throws ApiException { - ApiResponse> localVarResp = getArrayNonEmptyDomainJsonWithHttpInfo(namespace, array); + public Map getArrayNonEmptyDomainJson(String workspace, String teamspace, String array) throws ApiException { + ApiResponse> localVarResp = getArrayNonEmptyDomainJsonWithHttpInfo(workspace, teamspace, array); return localVarResp.getData(); } /** * * get non-empty domain from the array in json format - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ApiResponse<Map<String, Object>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3620,8 +3769,8 @@ public Map getArrayNonEmptyDomainJson(String namespace, String a 0 error response - */ - public ApiResponse> getArrayNonEmptyDomainJsonWithHttpInfo(String namespace, String array) throws ApiException { - okhttp3.Call localVarCall = getArrayNonEmptyDomainJsonValidateBeforeCall(namespace, array, null); + public ApiResponse> getArrayNonEmptyDomainJsonWithHttpInfo(String workspace, String teamspace, String array) throws ApiException { + okhttp3.Call localVarCall = getArrayNonEmptyDomainJsonValidateBeforeCall(workspace, teamspace, array, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3629,7 +3778,8 @@ public ApiResponse> getArrayNonEmptyDomainJsonWithHttpInfo(S /** * (asynchronously) * get non-empty domain from the array in json format - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -3642,16 +3792,17 @@ public ApiResponse> getArrayNonEmptyDomainJsonWithHttpInfo(S 0 error response - */ - public okhttp3.Call getArrayNonEmptyDomainJsonAsync(String namespace, String array, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getArrayNonEmptyDomainJsonAsync(String workspace, String teamspace, String array, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayNonEmptyDomainJsonValidateBeforeCall(namespace, array, _callback); + okhttp3.Call localVarCall = getArrayNonEmptyDomainJsonValidateBeforeCall(workspace, teamspace, array, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArraySampleData - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param samples Number of sample results to return (optional, default to 5.0) * @param _callback Callback for upload/download progress @@ -3665,7 +3816,7 @@ public okhttp3.Call getArrayNonEmptyDomainJsonAsync(String namespace, String arr 0 error response - */ - public okhttp3.Call getArraySampleDataCall(String namespace, String array, BigDecimal samples, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArraySampleDataCall(String workspace, String teamspace, String array, BigDecimal samples, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3682,8 +3833,9 @@ public okhttp3.Call getArraySampleDataCall(String namespace, String array, BigDe Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/sample" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/sample" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -3716,10 +3868,15 @@ public okhttp3.Call getArraySampleDataCall(String namespace, String array, BigDe } @SuppressWarnings("rawtypes") - private okhttp3.Call getArraySampleDataValidateBeforeCall(String namespace, String array, BigDecimal samples, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArraySampleData(Async)"); + private okhttp3.Call getArraySampleDataValidateBeforeCall(String workspace, String teamspace, String array, BigDecimal samples, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArraySampleData(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArraySampleData(Async)"); } // verify the required parameter 'array' is set @@ -3727,14 +3884,15 @@ private okhttp3.Call getArraySampleDataValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'array' when calling getArraySampleData(Async)"); } - return getArraySampleDataCall(namespace, array, samples, _callback); + return getArraySampleDataCall(workspace, teamspace, array, samples, _callback); } /** * * get an sample set of data from the array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param samples Number of sample results to return (optional, default to 5.0) * @return ArraySample @@ -3747,15 +3905,16 @@ private okhttp3.Call getArraySampleDataValidateBeforeCall(String namespace, Stri 0 error response - */ - public ArraySample getArraySampleData(String namespace, String array, BigDecimal samples) throws ApiException { - ApiResponse localVarResp = getArraySampleDataWithHttpInfo(namespace, array, samples); + public ArraySample getArraySampleData(String workspace, String teamspace, String array, BigDecimal samples) throws ApiException { + ApiResponse localVarResp = getArraySampleDataWithHttpInfo(workspace, teamspace, array, samples); return localVarResp.getData(); } /** * * get an sample set of data from the array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param samples Number of sample results to return (optional, default to 5.0) * @return ApiResponse<ArraySample> @@ -3768,8 +3927,8 @@ public ArraySample getArraySampleData(String namespace, String array, BigDecimal 0 error response - */ - public ApiResponse getArraySampleDataWithHttpInfo(String namespace, String array, BigDecimal samples) throws ApiException { - okhttp3.Call localVarCall = getArraySampleDataValidateBeforeCall(namespace, array, samples, null); + public ApiResponse getArraySampleDataWithHttpInfo(String workspace, String teamspace, String array, BigDecimal samples) throws ApiException { + okhttp3.Call localVarCall = getArraySampleDataValidateBeforeCall(workspace, teamspace, array, samples, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3777,7 +3936,8 @@ public ApiResponse getArraySampleDataWithHttpInfo(String namespace, /** * (asynchronously) * get an sample set of data from the array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param samples Number of sample results to return (optional, default to 5.0) * @param _callback The callback to be executed when the API call finishes @@ -3791,16 +3951,17 @@ public ApiResponse getArraySampleDataWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call getArraySampleDataAsync(String namespace, String array, BigDecimal samples, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArraySampleDataAsync(String workspace, String teamspace, String array, BigDecimal samples, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArraySampleDataValidateBeforeCall(namespace, array, samples, _callback); + okhttp3.Call localVarCall = getArraySampleDataValidateBeforeCall(workspace, teamspace, array, samples, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArraySharingPolicies - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -3814,7 +3975,7 @@ public okhttp3.Call getArraySampleDataAsync(String namespace, String array, BigD 0 error response - */ - public okhttp3.Call getArraySharingPoliciesCall(String namespace, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArraySharingPoliciesCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3831,8 +3992,9 @@ public okhttp3.Call getArraySharingPoliciesCall(String namespace, String array, Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -3861,10 +4023,15 @@ public okhttp3.Call getArraySharingPoliciesCall(String namespace, String array, } @SuppressWarnings("rawtypes") - private okhttp3.Call getArraySharingPoliciesValidateBeforeCall(String namespace, String array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArraySharingPolicies(Async)"); + private okhttp3.Call getArraySharingPoliciesValidateBeforeCall(String workspace, String teamspace, String array, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArraySharingPolicies(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArraySharingPolicies(Async)"); } // verify the required parameter 'array' is set @@ -3872,14 +4039,15 @@ private okhttp3.Call getArraySharingPoliciesValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'array' when calling getArraySharingPolicies(Async)"); } - return getArraySharingPoliciesCall(namespace, array, _callback); + return getArraySharingPoliciesCall(workspace, teamspace, array, _callback); } /** * * Get all sharing details of the array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return List<ArraySharing> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3892,15 +4060,16 @@ private okhttp3.Call getArraySharingPoliciesValidateBeforeCall(String namespace, 0 error response - */ - public List getArraySharingPolicies(String namespace, String array) throws ApiException { - ApiResponse> localVarResp = getArraySharingPoliciesWithHttpInfo(namespace, array); + public List getArraySharingPolicies(String workspace, String teamspace, String array) throws ApiException { + ApiResponse> localVarResp = getArraySharingPoliciesWithHttpInfo(workspace, teamspace, array); return localVarResp.getData(); } /** * * Get all sharing details of the array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @return ApiResponse<List<ArraySharing>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -3913,8 +4082,8 @@ public List getArraySharingPolicies(String namespace, String array 0 error response - */ - public ApiResponse> getArraySharingPoliciesWithHttpInfo(String namespace, String array) throws ApiException { - okhttp3.Call localVarCall = getArraySharingPoliciesValidateBeforeCall(namespace, array, null); + public ApiResponse> getArraySharingPoliciesWithHttpInfo(String workspace, String teamspace, String array) throws ApiException { + okhttp3.Call localVarCall = getArraySharingPoliciesValidateBeforeCall(workspace, teamspace, array, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -3922,7 +4091,8 @@ public ApiResponse> getArraySharingPoliciesWithHttpInfo(Strin /** * (asynchronously) * Get all sharing details of the array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -3936,16 +4106,17 @@ public ApiResponse> getArraySharingPoliciesWithHttpInfo(Strin 0 error response - */ - public okhttp3.Call getArraySharingPoliciesAsync(String namespace, String array, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getArraySharingPoliciesAsync(String workspace, String teamspace, String array, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getArraySharingPoliciesValidateBeforeCall(namespace, array, _callback); + okhttp3.Call localVarCall = getArraySharingPoliciesValidateBeforeCall(workspace, teamspace, array, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getArraysInNamespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param withMetadata include the metadata of the arrays (optional) * @param _callback Callback for upload/download progress * @return Call to execute @@ -3958,7 +4129,7 @@ public okhttp3.Call getArraySharingPoliciesAsync(String namespace, String array, 0 error response - */ - public okhttp3.Call getArraysInNamespaceCall(String namespace, Boolean withMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArraysInNamespaceCall(String workspace, String teamspace, Boolean withMetadata, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -3975,8 +4146,9 @@ public okhttp3.Call getArraysInNamespaceCall(String namespace, Boolean withMetad Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/arrays/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -4008,20 +4180,26 @@ public okhttp3.Call getArraysInNamespaceCall(String namespace, Boolean withMetad } @SuppressWarnings("rawtypes") - private okhttp3.Call getArraysInNamespaceValidateBeforeCall(String namespace, Boolean withMetadata, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArraysInNamespace(Async)"); + private okhttp3.Call getArraysInNamespaceValidateBeforeCall(String workspace, String teamspace, Boolean withMetadata, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArraysInNamespace(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArraysInNamespace(Async)"); } - return getArraysInNamespaceCall(namespace, withMetadata, _callback); + return getArraysInNamespaceCall(workspace, teamspace, withMetadata, _callback); } /** * * get metadata on all arrays in a namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param withMetadata include the metadata of the arrays (optional) * @return List<ArrayInfo> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -4033,15 +4211,16 @@ private okhttp3.Call getArraysInNamespaceValidateBeforeCall(String namespace, Bo 0 error response - */ - public List getArraysInNamespace(String namespace, Boolean withMetadata) throws ApiException { - ApiResponse> localVarResp = getArraysInNamespaceWithHttpInfo(namespace, withMetadata); + public List getArraysInNamespace(String workspace, String teamspace, Boolean withMetadata) throws ApiException { + ApiResponse> localVarResp = getArraysInNamespaceWithHttpInfo(workspace, teamspace, withMetadata); return localVarResp.getData(); } /** * * get metadata on all arrays in a namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param withMetadata include the metadata of the arrays (optional) * @return ApiResponse<List<ArrayInfo>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -4053,8 +4232,8 @@ public List getArraysInNamespace(String namespace, Boolean withMetada 0 error response - */ - public ApiResponse> getArraysInNamespaceWithHttpInfo(String namespace, Boolean withMetadata) throws ApiException { - okhttp3.Call localVarCall = getArraysInNamespaceValidateBeforeCall(namespace, withMetadata, null); + public ApiResponse> getArraysInNamespaceWithHttpInfo(String workspace, String teamspace, Boolean withMetadata) throws ApiException { + okhttp3.Call localVarCall = getArraysInNamespaceValidateBeforeCall(workspace, teamspace, withMetadata, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -4062,7 +4241,8 @@ public ApiResponse> getArraysInNamespaceWithHttpInfo(String name /** * (asynchronously) * get metadata on all arrays in a namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param withMetadata include the metadata of the arrays (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -4075,16 +4255,17 @@ public ApiResponse> getArraysInNamespaceWithHttpInfo(String name 0 error response - */ - public okhttp3.Call getArraysInNamespaceAsync(String namespace, Boolean withMetadata, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getArraysInNamespaceAsync(String workspace, String teamspace, Boolean withMetadata, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getArraysInNamespaceValidateBeforeCall(namespace, withMetadata, _callback); + okhttp3.Call localVarCall = getArraysInNamespaceValidateBeforeCall(workspace, teamspace, withMetadata, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getFragmentEndTimestamp - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param endTimestamp Milliseconds since Unix epoch (optional) * @param _callback Callback for upload/download progress @@ -4098,7 +4279,7 @@ public okhttp3.Call getArraysInNamespaceAsync(String namespace, Boolean withMeta 0 error response - */ - public okhttp3.Call getFragmentEndTimestampCall(String namespace, String array, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getFragmentEndTimestampCall(String workspace, String teamspace, String array, Integer endTimestamp, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -4115,8 +4296,9 @@ public okhttp3.Call getFragmentEndTimestampCall(String namespace, String array, Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/fragment_end_timestamp" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/fragment_end_timestamp" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -4149,10 +4331,15 @@ public okhttp3.Call getFragmentEndTimestampCall(String namespace, String array, } @SuppressWarnings("rawtypes") - private okhttp3.Call getFragmentEndTimestampValidateBeforeCall(String namespace, String array, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getFragmentEndTimestamp(Async)"); + private okhttp3.Call getFragmentEndTimestampValidateBeforeCall(String workspace, String teamspace, String array, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getFragmentEndTimestamp(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getFragmentEndTimestamp(Async)"); } // verify the required parameter 'array' is set @@ -4160,14 +4347,15 @@ private okhttp3.Call getFragmentEndTimestampValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'array' when calling getFragmentEndTimestamp(Async)"); } - return getFragmentEndTimestampCall(namespace, array, endTimestamp, _callback); + return getFragmentEndTimestampCall(workspace, teamspace, array, endTimestamp, _callback); } /** * * Get fragment end_timestamp on an array, will search for the closest end_timestamp to the timestamp asked - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param endTimestamp Milliseconds since Unix epoch (optional) * @return Integer @@ -4180,15 +4368,16 @@ private okhttp3.Call getFragmentEndTimestampValidateBeforeCall(String namespace, 0 error response - */ - public Integer getFragmentEndTimestamp(String namespace, String array, Integer endTimestamp) throws ApiException { - ApiResponse localVarResp = getFragmentEndTimestampWithHttpInfo(namespace, array, endTimestamp); + public Integer getFragmentEndTimestamp(String workspace, String teamspace, String array, Integer endTimestamp) throws ApiException { + ApiResponse localVarResp = getFragmentEndTimestampWithHttpInfo(workspace, teamspace, array, endTimestamp); return localVarResp.getData(); } /** * * Get fragment end_timestamp on an array, will search for the closest end_timestamp to the timestamp asked - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param endTimestamp Milliseconds since Unix epoch (optional) * @return ApiResponse<Integer> @@ -4201,8 +4390,8 @@ public Integer getFragmentEndTimestamp(String namespace, String array, Integer e 0 error response - */ - public ApiResponse getFragmentEndTimestampWithHttpInfo(String namespace, String array, Integer endTimestamp) throws ApiException { - okhttp3.Call localVarCall = getFragmentEndTimestampValidateBeforeCall(namespace, array, endTimestamp, null); + public ApiResponse getFragmentEndTimestampWithHttpInfo(String workspace, String teamspace, String array, Integer endTimestamp) throws ApiException { + okhttp3.Call localVarCall = getFragmentEndTimestampValidateBeforeCall(workspace, teamspace, array, endTimestamp, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -4210,7 +4399,8 @@ public ApiResponse getFragmentEndTimestampWithHttpInfo(String namespace /** * (asynchronously) * Get fragment end_timestamp on an array, will search for the closest end_timestamp to the timestamp asked - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param endTimestamp Milliseconds since Unix epoch (optional) * @param _callback The callback to be executed when the API call finishes @@ -4224,9 +4414,9 @@ public ApiResponse getFragmentEndTimestampWithHttpInfo(String namespace 0 error response - */ - public okhttp3.Call getFragmentEndTimestampAsync(String namespace, String array, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getFragmentEndTimestampAsync(String workspace, String teamspace, String array, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getFragmentEndTimestampValidateBeforeCall(namespace, array, endTimestamp, _callback); + okhttp3.Call localVarCall = getFragmentEndTimestampValidateBeforeCall(workspace, teamspace, array, endTimestamp, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -4354,7 +4544,8 @@ public okhttp3.Call getLastAccessedArraysAsync(final ApiCallback 0 error response - */ - public okhttp3.Call loadArraySchemaCall(String namespace, String array, LoadArraySchemaRequest loadArraySchemaRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call loadArraySchemaCall(String workspace, String teamspace, String array, LoadArraySchemaRequest loadArraySchemaRequest, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -4386,8 +4577,9 @@ public okhttp3.Call loadArraySchemaCall(String namespace, String array, LoadArra Object localVarPostBody = loadArraySchemaRequest; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/schema" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/schema" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -4417,10 +4609,15 @@ public okhttp3.Call loadArraySchemaCall(String namespace, String array, LoadArra } @SuppressWarnings("rawtypes") - private okhttp3.Call loadArraySchemaValidateBeforeCall(String namespace, String array, LoadArraySchemaRequest loadArraySchemaRequest, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling loadArraySchema(Async)"); + private okhttp3.Call loadArraySchemaValidateBeforeCall(String workspace, String teamspace, String array, LoadArraySchemaRequest loadArraySchemaRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling loadArraySchema(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling loadArraySchema(Async)"); } // verify the required parameter 'array' is set @@ -4433,14 +4630,15 @@ private okhttp3.Call loadArraySchemaValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'loadArraySchemaRequest' when calling loadArraySchema(Async)"); } - return loadArraySchemaCall(namespace, array, loadArraySchemaRequest, _callback); + return loadArraySchemaCall(workspace, teamspace, array, loadArraySchemaRequest, _callback); } /** * * request to get the array schema - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadArraySchemaRequest Load Array Schema Request (required) * @return LoadArraySchemaResponse @@ -4454,15 +4652,16 @@ private okhttp3.Call loadArraySchemaValidateBeforeCall(String namespace, String 0 error response - */ - public LoadArraySchemaResponse loadArraySchema(String namespace, String array, LoadArraySchemaRequest loadArraySchemaRequest) throws ApiException { - ApiResponse localVarResp = loadArraySchemaWithHttpInfo(namespace, array, loadArraySchemaRequest); + public LoadArraySchemaResponse loadArraySchema(String workspace, String teamspace, String array, LoadArraySchemaRequest loadArraySchemaRequest) throws ApiException { + ApiResponse localVarResp = loadArraySchemaWithHttpInfo(workspace, teamspace, array, loadArraySchemaRequest); return localVarResp.getData(); } /** * * request to get the array schema - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadArraySchemaRequest Load Array Schema Request (required) * @return ApiResponse<LoadArraySchemaResponse> @@ -4476,8 +4675,8 @@ public LoadArraySchemaResponse loadArraySchema(String namespace, String array, L 0 error response - */ - public ApiResponse loadArraySchemaWithHttpInfo(String namespace, String array, LoadArraySchemaRequest loadArraySchemaRequest) throws ApiException { - okhttp3.Call localVarCall = loadArraySchemaValidateBeforeCall(namespace, array, loadArraySchemaRequest, null); + public ApiResponse loadArraySchemaWithHttpInfo(String workspace, String teamspace, String array, LoadArraySchemaRequest loadArraySchemaRequest) throws ApiException { + okhttp3.Call localVarCall = loadArraySchemaValidateBeforeCall(workspace, teamspace, array, loadArraySchemaRequest, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -4485,7 +4684,8 @@ public ApiResponse loadArraySchemaWithHttpInfo(String n /** * (asynchronously) * request to get the array schema - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadArraySchemaRequest Load Array Schema Request (required) * @param _callback The callback to be executed when the API call finishes @@ -4500,16 +4700,17 @@ public ApiResponse loadArraySchemaWithHttpInfo(String n 0 error response - */ - public okhttp3.Call loadArraySchemaAsync(String namespace, String array, LoadArraySchemaRequest loadArraySchemaRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call loadArraySchemaAsync(String workspace, String teamspace, String array, LoadArraySchemaRequest loadArraySchemaRequest, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = loadArraySchemaValidateBeforeCall(namespace, array, loadArraySchemaRequest, _callback); + okhttp3.Call localVarCall = loadArraySchemaValidateBeforeCall(workspace, teamspace, array, loadArraySchemaRequest, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for loadEnumerations - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadEnumerationsRequest Load Enumerations Request (required) * @param _callback Callback for upload/download progress @@ -4524,7 +4725,7 @@ public okhttp3.Call loadArraySchemaAsync(String namespace, String array, LoadArr 0 error response - */ - public okhttp3.Call loadEnumerationsCall(String namespace, String array, LoadEnumerationsRequest loadEnumerationsRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call loadEnumerationsCall(String workspace, String teamspace, String array, LoadEnumerationsRequest loadEnumerationsRequest, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -4541,8 +4742,9 @@ public okhttp3.Call loadEnumerationsCall(String namespace, String array, LoadEnu Object localVarPostBody = loadEnumerationsRequest; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/enumerations" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/enumerations" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -4572,10 +4774,15 @@ public okhttp3.Call loadEnumerationsCall(String namespace, String array, LoadEnu } @SuppressWarnings("rawtypes") - private okhttp3.Call loadEnumerationsValidateBeforeCall(String namespace, String array, LoadEnumerationsRequest loadEnumerationsRequest, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling loadEnumerations(Async)"); + private okhttp3.Call loadEnumerationsValidateBeforeCall(String workspace, String teamspace, String array, LoadEnumerationsRequest loadEnumerationsRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling loadEnumerations(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling loadEnumerations(Async)"); } // verify the required parameter 'array' is set @@ -4588,14 +4795,15 @@ private okhttp3.Call loadEnumerationsValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'loadEnumerationsRequest' when calling loadEnumerations(Async)"); } - return loadEnumerationsCall(namespace, array, loadEnumerationsRequest, _callback); + return loadEnumerationsCall(workspace, teamspace, array, loadEnumerationsRequest, _callback); } /** * * request to get the enumerations of the arrays' attributes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadEnumerationsRequest Load Enumerations Request (required) * @return LoadEnumerationsResponse @@ -4609,15 +4817,16 @@ private okhttp3.Call loadEnumerationsValidateBeforeCall(String namespace, String 0 error response - */ - public LoadEnumerationsResponse loadEnumerations(String namespace, String array, LoadEnumerationsRequest loadEnumerationsRequest) throws ApiException { - ApiResponse localVarResp = loadEnumerationsWithHttpInfo(namespace, array, loadEnumerationsRequest); + public LoadEnumerationsResponse loadEnumerations(String workspace, String teamspace, String array, LoadEnumerationsRequest loadEnumerationsRequest) throws ApiException { + ApiResponse localVarResp = loadEnumerationsWithHttpInfo(workspace, teamspace, array, loadEnumerationsRequest); return localVarResp.getData(); } /** * * request to get the enumerations of the arrays' attributes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadEnumerationsRequest Load Enumerations Request (required) * @return ApiResponse<LoadEnumerationsResponse> @@ -4631,8 +4840,8 @@ public LoadEnumerationsResponse loadEnumerations(String namespace, String array, 0 error response - */ - public ApiResponse loadEnumerationsWithHttpInfo(String namespace, String array, LoadEnumerationsRequest loadEnumerationsRequest) throws ApiException { - okhttp3.Call localVarCall = loadEnumerationsValidateBeforeCall(namespace, array, loadEnumerationsRequest, null); + public ApiResponse loadEnumerationsWithHttpInfo(String workspace, String teamspace, String array, LoadEnumerationsRequest loadEnumerationsRequest) throws ApiException { + okhttp3.Call localVarCall = loadEnumerationsValidateBeforeCall(workspace, teamspace, array, loadEnumerationsRequest, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -4640,7 +4849,8 @@ public ApiResponse loadEnumerationsWithHttpInfo(String /** * (asynchronously) * request to get the enumerations of the arrays' attributes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param loadEnumerationsRequest Load Enumerations Request (required) * @param _callback The callback to be executed when the API call finishes @@ -4655,17 +4865,18 @@ public ApiResponse loadEnumerationsWithHttpInfo(String 0 error response - */ - public okhttp3.Call loadEnumerationsAsync(String namespace, String array, LoadEnumerationsRequest loadEnumerationsRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call loadEnumerationsAsync(String workspace, String teamspace, String array, LoadEnumerationsRequest loadEnumerationsRequest, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = loadEnumerationsValidateBeforeCall(namespace, array, loadEnumerationsRequest, _callback); + okhttp3.Call localVarCall = loadEnumerationsValidateBeforeCall(workspace, teamspace, array, loadEnumerationsRequest, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for registerArray - * @param namespace namespace array is in (an organization name or user's username) (required) - * @param array name/uri of array that is url-encoded (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param array asset id or path of array that is url-encoded (required) * @param arrayMetadata metadata associated with array (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -4678,7 +4889,7 @@ public okhttp3.Call loadEnumerationsAsync(String namespace, String array, LoadEn 0 error response - */ - public okhttp3.Call registerArrayCall(String namespace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerArrayCall(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -4695,8 +4906,9 @@ public okhttp3.Call registerArrayCall(String namespace, String array, ArrayInfoU Object localVarPostBody = arrayMetadata; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/register" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/register" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -4726,10 +4938,15 @@ public okhttp3.Call registerArrayCall(String namespace, String array, ArrayInfoU } @SuppressWarnings("rawtypes") - private okhttp3.Call registerArrayValidateBeforeCall(String namespace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling registerArray(Async)"); + private okhttp3.Call registerArrayValidateBeforeCall(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling registerArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling registerArray(Async)"); } // verify the required parameter 'array' is set @@ -4742,15 +4959,16 @@ private okhttp3.Call registerArrayValidateBeforeCall(String namespace, String ar throw new ApiException("Missing the required parameter 'arrayMetadata' when calling registerArray(Async)"); } - return registerArrayCall(namespace, array, arrayMetadata, _callback); + return registerArrayCall(workspace, teamspace, array, arrayMetadata, _callback); } /** * * register an array at a specified URI registered to the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) - * @param array name/uri of array that is url-encoded (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param array asset id or path of array that is url-encoded (required) * @param arrayMetadata metadata associated with array (required) * @return ArrayInfo * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -4762,16 +4980,17 @@ private okhttp3.Call registerArrayValidateBeforeCall(String namespace, String ar 0 error response - */ - public ArrayInfo registerArray(String namespace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { - ApiResponse localVarResp = registerArrayWithHttpInfo(namespace, array, arrayMetadata); + public ArrayInfo registerArray(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { + ApiResponse localVarResp = registerArrayWithHttpInfo(workspace, teamspace, array, arrayMetadata); return localVarResp.getData(); } /** * * register an array at a specified URI registered to the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) - * @param array name/uri of array that is url-encoded (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param array asset id or path of array that is url-encoded (required) * @param arrayMetadata metadata associated with array (required) * @return ApiResponse<ArrayInfo> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -4783,8 +5002,8 @@ public ArrayInfo registerArray(String namespace, String array, ArrayInfoUpdate a 0 error response - */ - public ApiResponse registerArrayWithHttpInfo(String namespace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { - okhttp3.Call localVarCall = registerArrayValidateBeforeCall(namespace, array, arrayMetadata, null); + public ApiResponse registerArrayWithHttpInfo(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { + okhttp3.Call localVarCall = registerArrayValidateBeforeCall(workspace, teamspace, array, arrayMetadata, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -4792,8 +5011,9 @@ public ApiResponse registerArrayWithHttpInfo(String namespace, String /** * (asynchronously) * register an array at a specified URI registered to the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) - * @param array name/uri of array that is url-encoded (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param array asset id or path of array that is url-encoded (required) * @param arrayMetadata metadata associated with array (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -4806,16 +5026,17 @@ public ApiResponse registerArrayWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call registerArrayAsync(String namespace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerArrayAsync(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = registerArrayValidateBeforeCall(namespace, array, arrayMetadata, _callback); + okhttp3.Call localVarCall = registerArrayValidateBeforeCall(workspace, teamspace, array, arrayMetadata, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for shareArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arraySharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the array will not be shared with the namespace at all. (required) * @param _callback Callback for upload/download progress @@ -4830,7 +5051,7 @@ public okhttp3.Call registerArrayAsync(String namespace, String array, ArrayInfo 0 error response - */ - public okhttp3.Call shareArrayCall(String namespace, String array, ArraySharing arraySharing, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareArrayCall(String workspace, String teamspace, String array, ArraySharing arraySharing, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -4847,8 +5068,9 @@ public okhttp3.Call shareArrayCall(String namespace, String array, ArraySharing Object localVarPostBody = arraySharing; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -4878,10 +5100,15 @@ public okhttp3.Call shareArrayCall(String namespace, String array, ArraySharing } @SuppressWarnings("rawtypes") - private okhttp3.Call shareArrayValidateBeforeCall(String namespace, String array, ArraySharing arraySharing, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling shareArray(Async)"); + private okhttp3.Call shareArrayValidateBeforeCall(String workspace, String teamspace, String array, ArraySharing arraySharing, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shareArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling shareArray(Async)"); } // verify the required parameter 'array' is set @@ -4894,14 +5121,15 @@ private okhttp3.Call shareArrayValidateBeforeCall(String namespace, String array throw new ApiException("Missing the required parameter 'arraySharing' when calling shareArray(Async)"); } - return shareArrayCall(namespace, array, arraySharing, _callback); + return shareArrayCall(workspace, teamspace, array, arraySharing, _callback); } /** * * Share an array with a user - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arraySharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the array will not be shared with the namespace at all. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -4914,14 +5142,15 @@ private okhttp3.Call shareArrayValidateBeforeCall(String namespace, String array 0 error response - */ - public void shareArray(String namespace, String array, ArraySharing arraySharing) throws ApiException { - shareArrayWithHttpInfo(namespace, array, arraySharing); + public void shareArray(String workspace, String teamspace, String array, ArraySharing arraySharing) throws ApiException { + shareArrayWithHttpInfo(workspace, teamspace, array, arraySharing); } /** * * Share an array with a user - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arraySharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the array will not be shared with the namespace at all. (required) * @return ApiResponse<Void> @@ -4935,15 +5164,16 @@ public void shareArray(String namespace, String array, ArraySharing arraySharing 0 error response - */ - public ApiResponse shareArrayWithHttpInfo(String namespace, String array, ArraySharing arraySharing) throws ApiException { - okhttp3.Call localVarCall = shareArrayValidateBeforeCall(namespace, array, arraySharing, null); + public ApiResponse shareArrayWithHttpInfo(String workspace, String teamspace, String array, ArraySharing arraySharing) throws ApiException { + okhttp3.Call localVarCall = shareArrayValidateBeforeCall(workspace, teamspace, array, arraySharing, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Share an array with a user - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arraySharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the array will not be shared with the namespace at all. (required) * @param _callback The callback to be executed when the API call finishes @@ -4958,15 +5188,16 @@ public ApiResponse shareArrayWithHttpInfo(String namespace, String array, 0 error response - */ - public okhttp3.Call shareArrayAsync(String namespace, String array, ArraySharing arraySharing, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareArrayAsync(String workspace, String teamspace, String array, ArraySharing arraySharing, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shareArrayValidateBeforeCall(namespace, array, arraySharing, _callback); + okhttp3.Call localVarCall = shareArrayValidateBeforeCall(workspace, teamspace, array, arraySharing, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for updateArrayMetadata - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadata array metadata to update (required) * @param _callback Callback for upload/download progress @@ -4980,7 +5211,7 @@ public okhttp3.Call shareArrayAsync(String namespace, String array, ArraySharing 0 error response - */ - public okhttp3.Call updateArrayMetadataCall(String namespace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateArrayMetadataCall(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -4997,8 +5228,9 @@ public okhttp3.Call updateArrayMetadataCall(String namespace, String array, Arra Object localVarPostBody = arrayMetadata; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/metadata" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/metadata" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -5028,10 +5260,15 @@ public okhttp3.Call updateArrayMetadataCall(String namespace, String array, Arra } @SuppressWarnings("rawtypes") - private okhttp3.Call updateArrayMetadataValidateBeforeCall(String namespace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateArrayMetadata(Async)"); + private okhttp3.Call updateArrayMetadataValidateBeforeCall(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateArrayMetadata(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling updateArrayMetadata(Async)"); } // verify the required parameter 'array' is set @@ -5044,14 +5281,15 @@ private okhttp3.Call updateArrayMetadataValidateBeforeCall(String namespace, Str throw new ApiException("Missing the required parameter 'arrayMetadata' when calling updateArrayMetadata(Async)"); } - return updateArrayMetadataCall(namespace, array, arrayMetadata, _callback); + return updateArrayMetadataCall(workspace, teamspace, array, arrayMetadata, _callback); } /** * * update metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadata array metadata to update (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -5063,14 +5301,15 @@ private okhttp3.Call updateArrayMetadataValidateBeforeCall(String namespace, Str 0 error response - */ - public void updateArrayMetadata(String namespace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { - updateArrayMetadataWithHttpInfo(namespace, array, arrayMetadata); + public void updateArrayMetadata(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { + updateArrayMetadataWithHttpInfo(workspace, teamspace, array, arrayMetadata); } /** * * update metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadata array metadata to update (required) * @return ApiResponse<Void> @@ -5083,15 +5322,16 @@ public void updateArrayMetadata(String namespace, String array, ArrayInfoUpdate 0 error response - */ - public ApiResponse updateArrayMetadataWithHttpInfo(String namespace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { - okhttp3.Call localVarCall = updateArrayMetadataValidateBeforeCall(namespace, array, arrayMetadata, null); + public ApiResponse updateArrayMetadataWithHttpInfo(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata) throws ApiException { + okhttp3.Call localVarCall = updateArrayMetadataValidateBeforeCall(workspace, teamspace, array, arrayMetadata, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * update metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadata array metadata to update (required) * @param _callback The callback to be executed when the API call finishes @@ -5105,15 +5345,16 @@ public ApiResponse updateArrayMetadataWithHttpInfo(String namespace, Strin 0 error response - */ - public okhttp3.Call updateArrayMetadataAsync(String namespace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateArrayMetadataAsync(String workspace, String teamspace, String array, ArrayInfoUpdate arrayMetadata, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateArrayMetadataValidateBeforeCall(namespace, array, arrayMetadata, _callback); + okhttp3.Call localVarCall = updateArrayMetadataValidateBeforeCall(workspace, teamspace, array, arrayMetadata, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for updateArrayMetadataCapnp - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadataEntries List of metadata entries (required) * @param _callback Callback for upload/download progress @@ -5127,7 +5368,7 @@ public okhttp3.Call updateArrayMetadataAsync(String namespace, String array, Arr 0 error response - */ - public okhttp3.Call updateArrayMetadataCapnpCall(String namespace, String array, ArrayMetadata arrayMetadataEntries, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateArrayMetadataCapnpCall(String workspace, String teamspace, String array, ArrayMetadata arrayMetadataEntries, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -5144,8 +5385,9 @@ public okhttp3.Call updateArrayMetadataCapnpCall(String namespace, String array, Object localVarPostBody = arrayMetadataEntries; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/array_metadata" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/array_metadata" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -5177,10 +5419,15 @@ public okhttp3.Call updateArrayMetadataCapnpCall(String namespace, String array, } @SuppressWarnings("rawtypes") - private okhttp3.Call updateArrayMetadataCapnpValidateBeforeCall(String namespace, String array, ArrayMetadata arrayMetadataEntries, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateArrayMetadataCapnp(Async)"); + private okhttp3.Call updateArrayMetadataCapnpValidateBeforeCall(String workspace, String teamspace, String array, ArrayMetadata arrayMetadataEntries, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateArrayMetadataCapnp(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling updateArrayMetadataCapnp(Async)"); } // verify the required parameter 'array' is set @@ -5193,14 +5440,15 @@ private okhttp3.Call updateArrayMetadataCapnpValidateBeforeCall(String namespace throw new ApiException("Missing the required parameter 'arrayMetadataEntries' when calling updateArrayMetadataCapnp(Async)"); } - return updateArrayMetadataCapnpCall(namespace, array, arrayMetadataEntries, _callback); + return updateArrayMetadataCapnpCall(workspace, teamspace, array, arrayMetadataEntries, _callback); } /** * * update metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadataEntries List of metadata entries (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -5212,14 +5460,15 @@ private okhttp3.Call updateArrayMetadataCapnpValidateBeforeCall(String namespace 0 error response - */ - public void updateArrayMetadataCapnp(String namespace, String array, ArrayMetadata arrayMetadataEntries) throws ApiException { - updateArrayMetadataCapnpWithHttpInfo(namespace, array, arrayMetadataEntries); + public void updateArrayMetadataCapnp(String workspace, String teamspace, String array, ArrayMetadata arrayMetadataEntries) throws ApiException { + updateArrayMetadataCapnpWithHttpInfo(workspace, teamspace, array, arrayMetadataEntries); } /** * * update metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadataEntries List of metadata entries (required) * @return ApiResponse<Void> @@ -5232,15 +5481,16 @@ public void updateArrayMetadataCapnp(String namespace, String array, ArrayMetada 0 error response - */ - public ApiResponse updateArrayMetadataCapnpWithHttpInfo(String namespace, String array, ArrayMetadata arrayMetadataEntries) throws ApiException { - okhttp3.Call localVarCall = updateArrayMetadataCapnpValidateBeforeCall(namespace, array, arrayMetadataEntries, null); + public ApiResponse updateArrayMetadataCapnpWithHttpInfo(String workspace, String teamspace, String array, ArrayMetadata arrayMetadataEntries) throws ApiException { + okhttp3.Call localVarCall = updateArrayMetadataCapnpValidateBeforeCall(workspace, teamspace, array, arrayMetadataEntries, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * update metadata on an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param arrayMetadataEntries List of metadata entries (required) * @param _callback The callback to be executed when the API call finishes @@ -5254,15 +5504,16 @@ public ApiResponse updateArrayMetadataCapnpWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call updateArrayMetadataCapnpAsync(String namespace, String array, ArrayMetadata arrayMetadataEntries, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateArrayMetadataCapnpAsync(String workspace, String teamspace, String array, ArrayMetadata arrayMetadataEntries, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateArrayMetadataCapnpValidateBeforeCall(namespace, array, arrayMetadataEntries, _callback); + okhttp3.Call localVarCall = updateArrayMetadataCapnpValidateBeforeCall(workspace, teamspace, array, arrayMetadataEntries, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for vacuumArray - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param vaccumRequest Vaccum Request (required) * @param _callback Callback for upload/download progress @@ -5276,7 +5527,7 @@ public okhttp3.Call updateArrayMetadataCapnpAsync(String namespace, String array 0 error response - */ - public okhttp3.Call vacuumArrayCall(String namespace, String array, ArrayVacuumRequest vaccumRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call vacuumArrayCall(String workspace, String teamspace, String array, ArrayVacuumRequest vaccumRequest, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -5293,8 +5544,9 @@ public okhttp3.Call vacuumArrayCall(String namespace, String array, ArrayVacuumR Object localVarPostBody = vaccumRequest; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/vacuum" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/vacuum" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -5324,10 +5576,15 @@ public okhttp3.Call vacuumArrayCall(String namespace, String array, ArrayVacuumR } @SuppressWarnings("rawtypes") - private okhttp3.Call vacuumArrayValidateBeforeCall(String namespace, String array, ArrayVacuumRequest vaccumRequest, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling vacuumArray(Async)"); + private okhttp3.Call vacuumArrayValidateBeforeCall(String workspace, String teamspace, String array, ArrayVacuumRequest vaccumRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling vacuumArray(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling vacuumArray(Async)"); } // verify the required parameter 'array' is set @@ -5340,14 +5597,15 @@ private okhttp3.Call vacuumArrayValidateBeforeCall(String namespace, String arra throw new ApiException("Missing the required parameter 'vaccumRequest' when calling vacuumArray(Async)"); } - return vacuumArrayCall(namespace, array, vaccumRequest, _callback); + return vacuumArrayCall(workspace, teamspace, array, vaccumRequest, _callback); } /** * * vacuum an array at a specified URI - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param vaccumRequest Vaccum Request (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -5359,14 +5617,15 @@ private okhttp3.Call vacuumArrayValidateBeforeCall(String namespace, String arra 0 error response - */ - public void vacuumArray(String namespace, String array, ArrayVacuumRequest vaccumRequest) throws ApiException { - vacuumArrayWithHttpInfo(namespace, array, vaccumRequest); + public void vacuumArray(String workspace, String teamspace, String array, ArrayVacuumRequest vaccumRequest) throws ApiException { + vacuumArrayWithHttpInfo(workspace, teamspace, array, vaccumRequest); } /** * * vacuum an array at a specified URI - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param vaccumRequest Vaccum Request (required) * @return ApiResponse<Void> @@ -5379,15 +5638,16 @@ public void vacuumArray(String namespace, String array, ArrayVacuumRequest vaccu 0 error response - */ - public ApiResponse vacuumArrayWithHttpInfo(String namespace, String array, ArrayVacuumRequest vaccumRequest) throws ApiException { - okhttp3.Call localVarCall = vacuumArrayValidateBeforeCall(namespace, array, vaccumRequest, null); + public ApiResponse vacuumArrayWithHttpInfo(String workspace, String teamspace, String array, ArrayVacuumRequest vaccumRequest) throws ApiException { + okhttp3.Call localVarCall = vacuumArrayValidateBeforeCall(workspace, teamspace, array, vaccumRequest, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * vacuum an array at a specified URI - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param vaccumRequest Vaccum Request (required) * @param _callback The callback to be executed when the API call finishes @@ -5401,9 +5661,9 @@ public ApiResponse vacuumArrayWithHttpInfo(String namespace, String array, 0 error response - */ - public okhttp3.Call vacuumArrayAsync(String namespace, String array, ArrayVacuumRequest vaccumRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call vacuumArrayAsync(String workspace, String teamspace, String array, ArrayVacuumRequest vaccumRequest, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = vacuumArrayValidateBeforeCall(namespace, array, vaccumRequest, _callback); + okhttp3.Call localVarCall = vacuumArrayValidateBeforeCall(workspace, teamspace, array, vaccumRequest, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/AssetsApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/AssetsApi.java index ee3ff5a..c1f2f2d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/AssetsApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/AssetsApi.java @@ -28,6 +28,7 @@ import io.tiledb.cloud.rest_api.model.AssetListResponse; +import io.tiledb.cloud.rest_api.model.ChangeAssetCredentialsRequest; import io.tiledb.cloud.rest_api.model.Error; import java.lang.reflect.Type; @@ -73,9 +74,157 @@ public void setCustomBaseUrl(String customBaseUrl) { this.localCustomBaseUrl = customBaseUrl; } + /** + * Build call for changeAssetCredentials + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param changeCredentialsRequest aws access credentials to store for a namespace (required) + * @param _callback Callback for upload/download progress + * @return Call to execute + * @throws ApiException If fail to serialize the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
204 Credentials changed successfully -
502 Bad Gateway -
0 error response -
+ */ + public okhttp3.Call changeAssetCredentialsCall(String workspace, String teamspace, ChangeAssetCredentialsRequest changeCredentialsRequest, final ApiCallback _callback) throws ApiException { + String basePath = null; + // Operation Servers + String[] localBasePaths = new String[] { }; + + // Determine Base Path to Use + if (localCustomBaseUrl != null){ + basePath = localCustomBaseUrl; + } else if ( localBasePaths.length > 0 ) { + basePath = localBasePaths[localHostIndex]; + } else { + basePath = null; + } + + Object localVarPostBody = changeCredentialsRequest; + + // create path and map variables + String localVarPath = "/assets/{workspace}/{teamspace}/change_credentials" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); + + List localVarQueryParams = new ArrayList(); + List localVarCollectionQueryParams = new ArrayList(); + Map localVarHeaderParams = new HashMap(); + Map localVarCookieParams = new HashMap(); + Map localVarFormParams = new HashMap(); + + final String[] localVarAccepts = { + "application/json" + }; + final String localVarAccept = localVarApiClient.selectHeaderAccept(localVarAccepts); + if (localVarAccept != null) { + localVarHeaderParams.put("Accept", localVarAccept); + } + + final String[] localVarContentTypes = { + "application/json" + }; + final String localVarContentType = localVarApiClient.selectHeaderContentType(localVarContentTypes); + if (localVarContentType != null) { + localVarHeaderParams.put("Content-Type", localVarContentType); + } + + String[] localVarAuthNames = new String[] { "BasicAuth", "ApiKeyAuth" }; + return localVarApiClient.buildCall(basePath, localVarPath, "POST", localVarQueryParams, localVarCollectionQueryParams, localVarPostBody, localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAuthNames, _callback); + } + + @SuppressWarnings("rawtypes") + private okhttp3.Call changeAssetCredentialsValidateBeforeCall(String workspace, String teamspace, ChangeAssetCredentialsRequest changeCredentialsRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling changeAssetCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling changeAssetCredentials(Async)"); + } + + // verify the required parameter 'changeCredentialsRequest' is set + if (changeCredentialsRequest == null) { + throw new ApiException("Missing the required parameter 'changeCredentialsRequest' when calling changeAssetCredentials(Async)"); + } + + return changeAssetCredentialsCall(workspace, teamspace, changeCredentialsRequest, _callback); + + } + + /** + * + * Changes the access credentials to the given assets + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param changeCredentialsRequest aws access credentials to store for a namespace (required) + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
204 Credentials changed successfully -
502 Bad Gateway -
0 error response -
+ */ + public void changeAssetCredentials(String workspace, String teamspace, ChangeAssetCredentialsRequest changeCredentialsRequest) throws ApiException { + changeAssetCredentialsWithHttpInfo(workspace, teamspace, changeCredentialsRequest); + } + + /** + * + * Changes the access credentials to the given assets + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param changeCredentialsRequest aws access credentials to store for a namespace (required) + * @return ApiResponse<Void> + * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body + * @http.response.details + + + + + +
Status Code Description Response Headers
204 Credentials changed successfully -
502 Bad Gateway -
0 error response -
+ */ + public ApiResponse changeAssetCredentialsWithHttpInfo(String workspace, String teamspace, ChangeAssetCredentialsRequest changeCredentialsRequest) throws ApiException { + okhttp3.Call localVarCall = changeAssetCredentialsValidateBeforeCall(workspace, teamspace, changeCredentialsRequest, null); + return localVarApiClient.execute(localVarCall); + } + + /** + * (asynchronously) + * Changes the access credentials to the given assets + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) + * @param changeCredentialsRequest aws access credentials to store for a namespace (required) + * @param _callback The callback to be executed when the API call finishes + * @return The request call + * @throws ApiException If fail to process the API call, e.g. serializing the request body object + * @http.response.details + + + + + +
Status Code Description Response Headers
204 Credentials changed successfully -
502 Bad Gateway -
0 error response -
+ */ + public okhttp3.Call changeAssetCredentialsAsync(String workspace, String teamspace, ChangeAssetCredentialsRequest changeCredentialsRequest, final ApiCallback _callback) throws ApiException { + + okhttp3.Call localVarCall = changeAssetCredentialsValidateBeforeCall(workspace, teamspace, changeCredentialsRequest, _callback); + localVarApiClient.executeAsync(localVarCall, _callback); + return localVarCall; + } /** * Build call for listAssets - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param assetType asset_type to filter to (optional) * @param ownershipLevel ownership_level to filter to (owned, shared) (optional) * @param depth depth of assets to be returned (optional) @@ -95,7 +244,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call listAssetsCall(String namespace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand, final ApiCallback _callback) throws ApiException { + public okhttp3.Call listAssetsCall(String workspace, String teamspace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -112,8 +261,9 @@ public okhttp3.Call listAssetsCall(String namespace, String assetType, String ow Object localVarPostBody = null; // create path and map variables - String localVarPath = "/assets/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/assets/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -173,20 +323,26 @@ public okhttp3.Call listAssetsCall(String namespace, String assetType, String ow } @SuppressWarnings("rawtypes") - private okhttp3.Call listAssetsValidateBeforeCall(String namespace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling listAssets(Async)"); + private okhttp3.Call listAssetsValidateBeforeCall(String workspace, String teamspace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling listAssets(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling listAssets(Async)"); } - return listAssetsCall(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand, _callback); + return listAssetsCall(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand, _callback); } /** * * List assets in a namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param assetType asset_type to filter to (optional) * @param ownershipLevel ownership_level to filter to (owned, shared) (optional) * @param depth depth of assets to be returned (optional) @@ -205,15 +361,16 @@ private okhttp3.Call listAssetsValidateBeforeCall(String namespace, String asset 0 error response - */ - public AssetListResponse listAssets(String namespace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand) throws ApiException { - ApiResponse localVarResp = listAssetsWithHttpInfo(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand); + public AssetListResponse listAssets(String workspace, String teamspace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand) throws ApiException { + ApiResponse localVarResp = listAssetsWithHttpInfo(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand); return localVarResp.getData(); } /** * * List assets in a namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param assetType asset_type to filter to (optional) * @param ownershipLevel ownership_level to filter to (owned, shared) (optional) * @param depth depth of assets to be returned (optional) @@ -232,8 +389,8 @@ public AssetListResponse listAssets(String namespace, String assetType, String o 0 error response - */ - public ApiResponse listAssetsWithHttpInfo(String namespace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand) throws ApiException { - okhttp3.Call localVarCall = listAssetsValidateBeforeCall(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand, null); + public ApiResponse listAssetsWithHttpInfo(String workspace, String teamspace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand) throws ApiException { + okhttp3.Call localVarCall = listAssetsValidateBeforeCall(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -241,7 +398,8 @@ public ApiResponse listAssetsWithHttpInfo(String namespace, S /** * (asynchronously) * List assets in a namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param assetType asset_type to filter to (optional) * @param ownershipLevel ownership_level to filter to (owned, shared) (optional) * @param depth depth of assets to be returned (optional) @@ -261,9 +419,9 @@ public ApiResponse listAssetsWithHttpInfo(String namespace, S 0 error response - */ - public okhttp3.Call listAssetsAsync(String namespace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand, final ApiCallback _callback) throws ApiException { + public okhttp3.Call listAssetsAsync(String workspace, String teamspace, String assetType, String ownershipLevel, String depth, String search, Integer page, Integer perPage, String orderBy, String expand, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = listAssetsValidateBeforeCall(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand, _callback); + okhttp3.Call localVarCall = listAssetsValidateBeforeCall(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/FavoritesApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/FavoritesApi.java index 0bddb96..00de0eb 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/FavoritesApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/FavoritesApi.java @@ -82,7 +82,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for addArrayFavorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -95,7 +96,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call addArrayFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addArrayFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -112,8 +113,9 @@ public okhttp3.Call addArrayFavoriteCall(String namespace, String name, final Ap Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -142,10 +144,15 @@ public okhttp3.Call addArrayFavoriteCall(String namespace, String name, final Ap } @SuppressWarnings("rawtypes") - private okhttp3.Call addArrayFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling addArrayFavorite(Async)"); + private okhttp3.Call addArrayFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling addArrayFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling addArrayFavorite(Async)"); } // verify the required parameter 'name' is set @@ -153,14 +160,15 @@ private okhttp3.Call addArrayFavoriteValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'name' when calling addArrayFavorite(Async)"); } - return addArrayFavoriteCall(namespace, name, _callback); + return addArrayFavoriteCall(workspace, teamspace, name, _callback); } /** * * Add a new array favorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -171,14 +179,15 @@ private okhttp3.Call addArrayFavoriteValidateBeforeCall(String namespace, String 0 error response - */ - public void addArrayFavorite(String namespace, String name) throws ApiException { - addArrayFavoriteWithHttpInfo(namespace, name); + public void addArrayFavorite(String workspace, String teamspace, String name) throws ApiException { + addArrayFavoriteWithHttpInfo(workspace, teamspace, name); } /** * * Add a new array favorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -190,15 +199,16 @@ public void addArrayFavorite(String namespace, String name) throws ApiException 0 error response - */ - public ApiResponse addArrayFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = addArrayFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse addArrayFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = addArrayFavoriteValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Add a new array favorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -211,15 +221,16 @@ public ApiResponse addArrayFavoriteWithHttpInfo(String namespace, String n 0 error response - */ - public okhttp3.Call addArrayFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addArrayFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = addArrayFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = addArrayFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for addMLModelFavorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -232,7 +243,7 @@ public okhttp3.Call addArrayFavoriteAsync(String namespace, String name, final A 0 error response - */ - public okhttp3.Call addMLModelFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addMLModelFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -249,8 +260,9 @@ public okhttp3.Call addMLModelFavoriteCall(String namespace, String name, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/ml_models/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/ml_models/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -279,10 +291,15 @@ public okhttp3.Call addMLModelFavoriteCall(String namespace, String name, final } @SuppressWarnings("rawtypes") - private okhttp3.Call addMLModelFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling addMLModelFavorite(Async)"); + private okhttp3.Call addMLModelFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling addMLModelFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling addMLModelFavorite(Async)"); } // verify the required parameter 'name' is set @@ -290,14 +307,15 @@ private okhttp3.Call addMLModelFavoriteValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'name' when calling addMLModelFavorite(Async)"); } - return addMLModelFavoriteCall(namespace, name, _callback); + return addMLModelFavoriteCall(workspace, teamspace, name, _callback); } /** * * Add a new ML model favorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -308,14 +326,15 @@ private okhttp3.Call addMLModelFavoriteValidateBeforeCall(String namespace, Stri 0 error response - */ - public void addMLModelFavorite(String namespace, String name) throws ApiException { - addMLModelFavoriteWithHttpInfo(namespace, name); + public void addMLModelFavorite(String workspace, String teamspace, String name) throws ApiException { + addMLModelFavoriteWithHttpInfo(workspace, teamspace, name); } /** * * Add a new ML model favorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -327,15 +346,16 @@ public void addMLModelFavorite(String namespace, String name) throws ApiExceptio 0 error response - */ - public ApiResponse addMLModelFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = addMLModelFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse addMLModelFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = addMLModelFavoriteValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Add a new ML model favorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -348,15 +368,16 @@ public ApiResponse addMLModelFavoriteWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call addMLModelFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addMLModelFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = addMLModelFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = addMLModelFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for addNotebookFavorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -369,7 +390,7 @@ public okhttp3.Call addMLModelFavoriteAsync(String namespace, String name, final 0 error response - */ - public okhttp3.Call addNotebookFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addNotebookFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -386,8 +407,9 @@ public okhttp3.Call addNotebookFavoriteCall(String namespace, String name, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -416,10 +438,15 @@ public okhttp3.Call addNotebookFavoriteCall(String namespace, String name, final } @SuppressWarnings("rawtypes") - private okhttp3.Call addNotebookFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling addNotebookFavorite(Async)"); + private okhttp3.Call addNotebookFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling addNotebookFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling addNotebookFavorite(Async)"); } // verify the required parameter 'name' is set @@ -427,14 +454,15 @@ private okhttp3.Call addNotebookFavoriteValidateBeforeCall(String namespace, Str throw new ApiException("Missing the required parameter 'name' when calling addNotebookFavorite(Async)"); } - return addNotebookFavoriteCall(namespace, name, _callback); + return addNotebookFavoriteCall(workspace, teamspace, name, _callback); } /** * * Add a new notebook favorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -445,14 +473,15 @@ private okhttp3.Call addNotebookFavoriteValidateBeforeCall(String namespace, Str 0 error response - */ - public void addNotebookFavorite(String namespace, String name) throws ApiException { - addNotebookFavoriteWithHttpInfo(namespace, name); + public void addNotebookFavorite(String workspace, String teamspace, String name) throws ApiException { + addNotebookFavoriteWithHttpInfo(workspace, teamspace, name); } /** * * Add a new notebook favorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -464,15 +493,16 @@ public void addNotebookFavorite(String namespace, String name) throws ApiExcepti 0 error response - */ - public ApiResponse addNotebookFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = addNotebookFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse addNotebookFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = addNotebookFavoriteValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Add a new notebook favorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -485,15 +515,15 @@ public ApiResponse addNotebookFavoriteWithHttpInfo(String namespace, Strin 0 error response - */ - public okhttp3.Call addNotebookFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addNotebookFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = addNotebookFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = addNotebookFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for addUDFFavorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -506,7 +536,7 @@ public okhttp3.Call addNotebookFavoriteAsync(String namespace, String name, fina 0 error response - */ - public okhttp3.Call addUDFFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addUDFFavoriteCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -523,8 +553,8 @@ public okhttp3.Call addUDFFavoriteCall(String namespace, String name, final ApiC Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udfs/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udfs/favorites/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -553,10 +583,10 @@ public okhttp3.Call addUDFFavoriteCall(String namespace, String name, final ApiC } @SuppressWarnings("rawtypes") - private okhttp3.Call addUDFFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling addUDFFavorite(Async)"); + private okhttp3.Call addUDFFavoriteValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling addUDFFavorite(Async)"); } // verify the required parameter 'name' is set @@ -564,14 +594,14 @@ private okhttp3.Call addUDFFavoriteValidateBeforeCall(String namespace, String n throw new ApiException("Missing the required parameter 'name' when calling addUDFFavorite(Async)"); } - return addUDFFavoriteCall(namespace, name, _callback); + return addUDFFavoriteCall(workspace, name, _callback); } /** * * Add a new UDF favorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -582,14 +612,14 @@ private okhttp3.Call addUDFFavoriteValidateBeforeCall(String namespace, String n 0 error response - */ - public void addUDFFavorite(String namespace, String name) throws ApiException { - addUDFFavoriteWithHttpInfo(namespace, name); + public void addUDFFavorite(String workspace, String name) throws ApiException { + addUDFFavoriteWithHttpInfo(workspace, name); } /** * * Add a new UDF favorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -601,15 +631,15 @@ public void addUDFFavorite(String namespace, String name) throws ApiException { 0 error response - */ - public ApiResponse addUDFFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = addUDFFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse addUDFFavoriteWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = addUDFFavoriteValidateBeforeCall(workspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Add a new UDF favorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -622,15 +652,16 @@ public ApiResponse addUDFFavoriteWithHttpInfo(String namespace, String nam 0 error response - */ - public okhttp3.Call addUDFFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addUDFFavoriteAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = addUDFFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = addUDFFavoriteValidateBeforeCall(workspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deleteArrayFavorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -643,7 +674,7 @@ public okhttp3.Call addUDFFavoriteAsync(String namespace, String name, final Api 0 error response - */ - public okhttp3.Call deleteArrayFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteArrayFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -660,8 +691,9 @@ public okhttp3.Call deleteArrayFavoriteCall(String namespace, String name, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -690,10 +722,15 @@ public okhttp3.Call deleteArrayFavoriteCall(String namespace, String name, final } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteArrayFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteArrayFavorite(Async)"); + private okhttp3.Call deleteArrayFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteArrayFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteArrayFavorite(Async)"); } // verify the required parameter 'name' is set @@ -701,14 +738,15 @@ private okhttp3.Call deleteArrayFavoriteValidateBeforeCall(String namespace, Str throw new ApiException("Missing the required parameter 'name' when calling deleteArrayFavorite(Async)"); } - return deleteArrayFavoriteCall(namespace, name, _callback); + return deleteArrayFavoriteCall(workspace, teamspace, name, _callback); } /** * * Delete specific array favorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -719,14 +757,15 @@ private okhttp3.Call deleteArrayFavoriteValidateBeforeCall(String namespace, Str 0 error response - */ - public void deleteArrayFavorite(String namespace, String name) throws ApiException { - deleteArrayFavoriteWithHttpInfo(namespace, name); + public void deleteArrayFavorite(String workspace, String teamspace, String name) throws ApiException { + deleteArrayFavoriteWithHttpInfo(workspace, teamspace, name); } /** * * Delete specific array favorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -738,15 +777,16 @@ public void deleteArrayFavorite(String namespace, String name) throws ApiExcepti 0 error response - */ - public ApiResponse deleteArrayFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteArrayFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse deleteArrayFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteArrayFavoriteValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Delete specific array favorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -759,15 +799,16 @@ public ApiResponse deleteArrayFavoriteWithHttpInfo(String namespace, Strin 0 error response - */ - public okhttp3.Call deleteArrayFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteArrayFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteArrayFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteArrayFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deleteMLModelFavorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -780,7 +821,7 @@ public okhttp3.Call deleteArrayFavoriteAsync(String namespace, String name, fina 0 error response - */ - public okhttp3.Call deleteMLModelFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteMLModelFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -797,8 +838,9 @@ public okhttp3.Call deleteMLModelFavoriteCall(String namespace, String name, fin Object localVarPostBody = null; // create path and map variables - String localVarPath = "/ml_models/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/ml_models/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -827,10 +869,15 @@ public okhttp3.Call deleteMLModelFavoriteCall(String namespace, String name, fin } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteMLModelFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteMLModelFavorite(Async)"); + private okhttp3.Call deleteMLModelFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteMLModelFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteMLModelFavorite(Async)"); } // verify the required parameter 'name' is set @@ -838,14 +885,15 @@ private okhttp3.Call deleteMLModelFavoriteValidateBeforeCall(String namespace, S throw new ApiException("Missing the required parameter 'name' when calling deleteMLModelFavorite(Async)"); } - return deleteMLModelFavoriteCall(namespace, name, _callback); + return deleteMLModelFavoriteCall(workspace, teamspace, name, _callback); } /** * * Delete specific ML model favorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -856,14 +904,15 @@ private okhttp3.Call deleteMLModelFavoriteValidateBeforeCall(String namespace, S 0 error response - */ - public void deleteMLModelFavorite(String namespace, String name) throws ApiException { - deleteMLModelFavoriteWithHttpInfo(namespace, name); + public void deleteMLModelFavorite(String workspace, String teamspace, String name) throws ApiException { + deleteMLModelFavoriteWithHttpInfo(workspace, teamspace, name); } /** * * Delete specific ML model favorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -875,15 +924,16 @@ public void deleteMLModelFavorite(String namespace, String name) throws ApiExcep 0 error response - */ - public ApiResponse deleteMLModelFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteMLModelFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse deleteMLModelFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteMLModelFavoriteValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Delete specific ML model favorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -896,15 +946,16 @@ public ApiResponse deleteMLModelFavoriteWithHttpInfo(String namespace, Str 0 error response - */ - public okhttp3.Call deleteMLModelFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteMLModelFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteMLModelFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteMLModelFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deleteNotebookFavorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -917,7 +968,7 @@ public okhttp3.Call deleteMLModelFavoriteAsync(String namespace, String name, fi 0 error response - */ - public okhttp3.Call deleteNotebookFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteNotebookFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -934,8 +985,9 @@ public okhttp3.Call deleteNotebookFavoriteCall(String namespace, String name, fi Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -964,10 +1016,15 @@ public okhttp3.Call deleteNotebookFavoriteCall(String namespace, String name, fi } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteNotebookFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteNotebookFavorite(Async)"); + private okhttp3.Call deleteNotebookFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteNotebookFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteNotebookFavorite(Async)"); } // verify the required parameter 'name' is set @@ -975,14 +1032,15 @@ private okhttp3.Call deleteNotebookFavoriteValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'name' when calling deleteNotebookFavorite(Async)"); } - return deleteNotebookFavoriteCall(namespace, name, _callback); + return deleteNotebookFavoriteCall(workspace, teamspace, name, _callback); } /** * * Delete specific notebook favorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -993,14 +1051,15 @@ private okhttp3.Call deleteNotebookFavoriteValidateBeforeCall(String namespace, 0 error response - */ - public void deleteNotebookFavorite(String namespace, String name) throws ApiException { - deleteNotebookFavoriteWithHttpInfo(namespace, name); + public void deleteNotebookFavorite(String workspace, String teamspace, String name) throws ApiException { + deleteNotebookFavoriteWithHttpInfo(workspace, teamspace, name); } /** * * Delete specific notebook favorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1012,15 +1071,16 @@ public void deleteNotebookFavorite(String namespace, String name) throws ApiExce 0 error response - */ - public ApiResponse deleteNotebookFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteNotebookFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse deleteNotebookFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteNotebookFavoriteValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Delete specific notebook favorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1033,15 +1093,15 @@ public ApiResponse deleteNotebookFavoriteWithHttpInfo(String namespace, St 0 error response - */ - public okhttp3.Call deleteNotebookFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteNotebookFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteNotebookFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteNotebookFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deleteUDFFavorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1054,7 +1114,7 @@ public okhttp3.Call deleteNotebookFavoriteAsync(String namespace, String name, f 0 error response - */ - public okhttp3.Call deleteUDFFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteUDFFavoriteCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1071,8 +1131,8 @@ public okhttp3.Call deleteUDFFavoriteCall(String namespace, String name, final A Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udfs/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udfs/favorites/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1101,10 +1161,10 @@ public okhttp3.Call deleteUDFFavoriteCall(String namespace, String name, final A } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteUDFFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteUDFFavorite(Async)"); + private okhttp3.Call deleteUDFFavoriteValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteUDFFavorite(Async)"); } // verify the required parameter 'name' is set @@ -1112,14 +1172,14 @@ private okhttp3.Call deleteUDFFavoriteValidateBeforeCall(String namespace, Strin throw new ApiException("Missing the required parameter 'name' when calling deleteUDFFavorite(Async)"); } - return deleteUDFFavoriteCall(namespace, name, _callback); + return deleteUDFFavoriteCall(workspace, name, _callback); } /** * * Delete specific UDF favorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1130,14 +1190,14 @@ private okhttp3.Call deleteUDFFavoriteValidateBeforeCall(String namespace, Strin 0 error response - */ - public void deleteUDFFavorite(String namespace, String name) throws ApiException { - deleteUDFFavoriteWithHttpInfo(namespace, name); + public void deleteUDFFavorite(String workspace, String name) throws ApiException { + deleteUDFFavoriteWithHttpInfo(workspace, name); } /** * * Delete specific UDF favorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1149,15 +1209,15 @@ public void deleteUDFFavorite(String namespace, String name) throws ApiException 0 error response - */ - public ApiResponse deleteUDFFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteUDFFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse deleteUDFFavoriteWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteUDFFavoriteValidateBeforeCall(workspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Delete specific UDF favorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1170,15 +1230,16 @@ public ApiResponse deleteUDFFavoriteWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call deleteUDFFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteUDFFavoriteAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteUDFFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteUDFFavoriteValidateBeforeCall(workspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for getArrayFavorite - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1191,7 +1252,7 @@ public okhttp3.Call deleteUDFFavoriteAsync(String namespace, String name, final 0 error response - */ - public okhttp3.Call getArrayFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1208,8 +1269,9 @@ public okhttp3.Call getArrayFavoriteCall(String namespace, String name, final Ap Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1238,10 +1300,15 @@ public okhttp3.Call getArrayFavoriteCall(String namespace, String name, final Ap } @SuppressWarnings("rawtypes") - private okhttp3.Call getArrayFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getArrayFavorite(Async)"); + private okhttp3.Call getArrayFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getArrayFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getArrayFavorite(Async)"); } // verify the required parameter 'name' is set @@ -1249,14 +1316,15 @@ private okhttp3.Call getArrayFavoriteValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'name' when calling getArrayFavorite(Async)"); } - return getArrayFavoriteCall(namespace, name, _callback); + return getArrayFavoriteCall(workspace, teamspace, name, _callback); } /** * * Fetch array favorite of a specific array - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @return ArrayFavorite * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1268,15 +1336,16 @@ private okhttp3.Call getArrayFavoriteValidateBeforeCall(String namespace, String 0 error response - */ - public ArrayFavorite getArrayFavorite(String namespace, String name) throws ApiException { - ApiResponse localVarResp = getArrayFavoriteWithHttpInfo(namespace, name); + public ArrayFavorite getArrayFavorite(String workspace, String teamspace, String name) throws ApiException { + ApiResponse localVarResp = getArrayFavoriteWithHttpInfo(workspace, teamspace, name); return localVarResp.getData(); } /** * * Fetch array favorite of a specific array - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @return ApiResponse<ArrayFavorite> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1288,8 +1357,8 @@ public ArrayFavorite getArrayFavorite(String namespace, String name) throws ApiE 0 error response - */ - public ApiResponse getArrayFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getArrayFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse getArrayFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = getArrayFavoriteValidateBeforeCall(workspace, teamspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1297,7 +1366,8 @@ public ApiResponse getArrayFavoriteWithHttpInfo(String namespace, /** * (asynchronously) * Fetch array favorite of a specific array - * @param namespace The namespace of the array (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the array (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1310,16 +1380,17 @@ public ApiResponse getArrayFavoriteWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call getArrayFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getArrayFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getArrayFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getArrayFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getMLModelFavorite - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1332,7 +1403,7 @@ public okhttp3.Call getArrayFavoriteAsync(String namespace, String name, final A 0 error response - */ - public okhttp3.Call getMLModelFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getMLModelFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1349,8 +1420,9 @@ public okhttp3.Call getMLModelFavoriteCall(String namespace, String name, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/ml_models/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/ml_models/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1379,10 +1451,15 @@ public okhttp3.Call getMLModelFavoriteCall(String namespace, String name, final } @SuppressWarnings("rawtypes") - private okhttp3.Call getMLModelFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getMLModelFavorite(Async)"); + private okhttp3.Call getMLModelFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getMLModelFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getMLModelFavorite(Async)"); } // verify the required parameter 'name' is set @@ -1390,14 +1467,15 @@ private okhttp3.Call getMLModelFavoriteValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'name' when calling getMLModelFavorite(Async)"); } - return getMLModelFavoriteCall(namespace, name, _callback); + return getMLModelFavoriteCall(workspace, teamspace, name, _callback); } /** * * Fetch ML model favorite of a specific ML model - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @return MLModelFavorite * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1409,15 +1487,16 @@ private okhttp3.Call getMLModelFavoriteValidateBeforeCall(String namespace, Stri 0 error response - */ - public MLModelFavorite getMLModelFavorite(String namespace, String name) throws ApiException { - ApiResponse localVarResp = getMLModelFavoriteWithHttpInfo(namespace, name); + public MLModelFavorite getMLModelFavorite(String workspace, String teamspace, String name) throws ApiException { + ApiResponse localVarResp = getMLModelFavoriteWithHttpInfo(workspace, teamspace, name); return localVarResp.getData(); } /** * * Fetch ML model favorite of a specific ML model - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @return ApiResponse<MLModelFavorite> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1429,8 +1508,8 @@ public MLModelFavorite getMLModelFavorite(String namespace, String name) throws 0 error response - */ - public ApiResponse getMLModelFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getMLModelFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse getMLModelFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = getMLModelFavoriteValidateBeforeCall(workspace, teamspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1438,7 +1517,8 @@ public ApiResponse getMLModelFavoriteWithHttpInfo(String namesp /** * (asynchronously) * Fetch ML model favorite of a specific ML model - * @param namespace The namespace of the ML model (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the ML model (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1451,16 +1531,17 @@ public ApiResponse getMLModelFavoriteWithHttpInfo(String namesp 0 error response - */ - public okhttp3.Call getMLModelFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getMLModelFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getMLModelFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getMLModelFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getNotebookFavorite - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1473,7 +1554,7 @@ public okhttp3.Call getMLModelFavoriteAsync(String namespace, String name, final 0 error response - */ - public okhttp3.Call getNotebookFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getNotebookFavoriteCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1490,8 +1571,9 @@ public okhttp3.Call getNotebookFavoriteCall(String namespace, String name, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/favorites/{workspace}/{teamspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1520,10 +1602,15 @@ public okhttp3.Call getNotebookFavoriteCall(String namespace, String name, final } @SuppressWarnings("rawtypes") - private okhttp3.Call getNotebookFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getNotebookFavorite(Async)"); + private okhttp3.Call getNotebookFavoriteValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getNotebookFavorite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getNotebookFavorite(Async)"); } // verify the required parameter 'name' is set @@ -1531,14 +1618,15 @@ private okhttp3.Call getNotebookFavoriteValidateBeforeCall(String namespace, Str throw new ApiException("Missing the required parameter 'name' when calling getNotebookFavorite(Async)"); } - return getNotebookFavoriteCall(namespace, name, _callback); + return getNotebookFavoriteCall(workspace, teamspace, name, _callback); } /** * * Fetch notebook favorite of a specific notebook - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @return NotebookFavorite * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1550,15 +1638,16 @@ private okhttp3.Call getNotebookFavoriteValidateBeforeCall(String namespace, Str 0 error response - */ - public NotebookFavorite getNotebookFavorite(String namespace, String name) throws ApiException { - ApiResponse localVarResp = getNotebookFavoriteWithHttpInfo(namespace, name); + public NotebookFavorite getNotebookFavorite(String workspace, String teamspace, String name) throws ApiException { + ApiResponse localVarResp = getNotebookFavoriteWithHttpInfo(workspace, teamspace, name); return localVarResp.getData(); } /** * * Fetch notebook favorite of a specific notebook - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @return ApiResponse<NotebookFavorite> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1570,8 +1659,8 @@ public NotebookFavorite getNotebookFavorite(String namespace, String name) throw 0 error response - */ - public ApiResponse getNotebookFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getNotebookFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse getNotebookFavoriteWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = getNotebookFavoriteValidateBeforeCall(workspace, teamspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1579,7 +1668,8 @@ public ApiResponse getNotebookFavoriteWithHttpInfo(String name /** * (asynchronously) * Fetch notebook favorite of a specific notebook - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param name The name of the notebook (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1592,16 +1682,16 @@ public ApiResponse getNotebookFavoriteWithHttpInfo(String name 0 error response - */ - public okhttp3.Call getNotebookFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getNotebookFavoriteAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getNotebookFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getNotebookFavoriteValidateBeforeCall(workspace, teamspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getUDFFavorite - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1614,7 +1704,7 @@ public okhttp3.Call getNotebookFavoriteAsync(String namespace, String name, fina 0 error response - */ - public okhttp3.Call getUDFFavoriteCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getUDFFavoriteCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1631,8 +1721,8 @@ public okhttp3.Call getUDFFavoriteCall(String namespace, String name, final ApiC Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udfs/favorites/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udfs/favorites/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1661,10 +1751,10 @@ public okhttp3.Call getUDFFavoriteCall(String namespace, String name, final ApiC } @SuppressWarnings("rawtypes") - private okhttp3.Call getUDFFavoriteValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getUDFFavorite(Async)"); + private okhttp3.Call getUDFFavoriteValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getUDFFavorite(Async)"); } // verify the required parameter 'name' is set @@ -1672,14 +1762,14 @@ private okhttp3.Call getUDFFavoriteValidateBeforeCall(String namespace, String n throw new ApiException("Missing the required parameter 'name' when calling getUDFFavorite(Async)"); } - return getUDFFavoriteCall(namespace, name, _callback); + return getUDFFavoriteCall(workspace, name, _callback); } /** * * Fetch UDF favorite of a specific UDF - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @return UDFFavorite * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1691,15 +1781,15 @@ private okhttp3.Call getUDFFavoriteValidateBeforeCall(String namespace, String n 0 error response - */ - public UDFFavorite getUDFFavorite(String namespace, String name) throws ApiException { - ApiResponse localVarResp = getUDFFavoriteWithHttpInfo(namespace, name); + public UDFFavorite getUDFFavorite(String workspace, String name) throws ApiException { + ApiResponse localVarResp = getUDFFavoriteWithHttpInfo(workspace, name); return localVarResp.getData(); } /** * * Fetch UDF favorite of a specific UDF - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @return ApiResponse<UDFFavorite> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1711,8 +1801,8 @@ public UDFFavorite getUDFFavorite(String namespace, String name) throws ApiExcep 0 error response - */ - public ApiResponse getUDFFavoriteWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getUDFFavoriteValidateBeforeCall(namespace, name, null); + public ApiResponse getUDFFavoriteWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = getUDFFavoriteValidateBeforeCall(workspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1720,7 +1810,7 @@ public ApiResponse getUDFFavoriteWithHttpInfo(String namespace, Str /** * (asynchronously) * Fetch UDF favorite of a specific UDF - * @param namespace The namespace of the UDF (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the UDF (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1733,9 +1823,9 @@ public ApiResponse getUDFFavoriteWithHttpInfo(String namespace, Str 0 error response - */ - public okhttp3.Call getUDFFavoriteAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getUDFFavoriteAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getUDFFavoriteValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getUDFFavoriteValidateBeforeCall(workspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/FilesApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/FilesApi.java index de5e007..ced13cd 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/FilesApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/FilesApi.java @@ -80,7 +80,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for handleCreateFile - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param fileCreate Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param _callback Callback for upload/download progress @@ -94,7 +95,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call handleCreateFileCall(String namespace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleCreateFileCall(String workspace, String teamspace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -111,8 +112,9 @@ public okhttp3.Call handleCreateFileCall(String namespace, FileCreate fileCreate Object localVarPostBody = fileCreate; // create path and map variables - String localVarPath = "/files/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/files/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -145,10 +147,15 @@ public okhttp3.Call handleCreateFileCall(String namespace, FileCreate fileCreate } @SuppressWarnings("rawtypes") - private okhttp3.Call handleCreateFileValidateBeforeCall(String namespace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling handleCreateFile(Async)"); + private okhttp3.Call handleCreateFileValidateBeforeCall(String workspace, String teamspace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling handleCreateFile(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling handleCreateFile(Async)"); } // verify the required parameter 'fileCreate' is set @@ -156,14 +163,15 @@ private okhttp3.Call handleCreateFileValidateBeforeCall(String namespace, FileCr throw new ApiException("Missing the required parameter 'fileCreate' when calling handleCreateFile(Async)"); } - return handleCreateFileCall(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); + return handleCreateFileCall(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); } /** * * Create a tiledb file at the specified location - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param fileCreate Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @return FileCreated @@ -176,15 +184,16 @@ private okhttp3.Call handleCreateFileValidateBeforeCall(String namespace, FileCr 0 error response - */ - public FileCreated handleCreateFile(String namespace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { - ApiResponse localVarResp = handleCreateFileWithHttpInfo(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); + public FileCreated handleCreateFile(String workspace, String teamspace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { + ApiResponse localVarResp = handleCreateFileWithHttpInfo(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); return localVarResp.getData(); } /** * * Create a tiledb file at the specified location - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param fileCreate Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @return ApiResponse<FileCreated> @@ -197,8 +206,8 @@ public FileCreated handleCreateFile(String namespace, FileCreate fileCreate, Str 0 error response - */ - public ApiResponse handleCreateFileWithHttpInfo(String namespace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { - okhttp3.Call localVarCall = handleCreateFileValidateBeforeCall(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, null); + public ApiResponse handleCreateFileWithHttpInfo(String workspace, String teamspace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME) throws ApiException { + okhttp3.Call localVarCall = handleCreateFileValidateBeforeCall(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -206,7 +215,8 @@ public ApiResponse handleCreateFileWithHttpInfo(String namespace, F /** * (asynchronously) * Create a tiledb file at the specified location - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param fileCreate Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param _callback The callback to be executed when the API call finishes @@ -220,16 +230,17 @@ public ApiResponse handleCreateFileWithHttpInfo(String namespace, F 0 error response - */ - public okhttp3.Call handleCreateFileAsync(String namespace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleCreateFileAsync(String workspace, String teamspace, FileCreate fileCreate, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = handleCreateFileValidateBeforeCall(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); + okhttp3.Call localVarCall = handleCreateFileValidateBeforeCall(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for handleExportFile - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _file The file identifier (required) * @param fileExport Export configuration information (required) * @param _callback Callback for upload/download progress @@ -243,7 +254,7 @@ public okhttp3.Call handleCreateFileAsync(String namespace, FileCreate fileCreat 0 error response - */ - public okhttp3.Call handleExportFileCall(String namespace, String _file, FileExport fileExport, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleExportFileCall(String workspace, String teamspace, String _file, FileExport fileExport, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -260,8 +271,9 @@ public okhttp3.Call handleExportFileCall(String namespace, String _file, FileExp Object localVarPostBody = fileExport; // create path and map variables - String localVarPath = "/files/{namespace}/{file}/export" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/files/{workspace}/{teamspace}/{file}/export" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "file" + "}", localVarApiClient.escapeString(_file.toString())); List localVarQueryParams = new ArrayList(); @@ -291,10 +303,15 @@ public okhttp3.Call handleExportFileCall(String namespace, String _file, FileExp } @SuppressWarnings("rawtypes") - private okhttp3.Call handleExportFileValidateBeforeCall(String namespace, String _file, FileExport fileExport, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling handleExportFile(Async)"); + private okhttp3.Call handleExportFileValidateBeforeCall(String workspace, String teamspace, String _file, FileExport fileExport, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling handleExportFile(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling handleExportFile(Async)"); } // verify the required parameter '_file' is set @@ -307,14 +324,15 @@ private okhttp3.Call handleExportFileValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'fileExport' when calling handleExportFile(Async)"); } - return handleExportFileCall(namespace, _file, fileExport, _callback); + return handleExportFileCall(workspace, teamspace, _file, fileExport, _callback); } /** * * Export a TileDB File back to its original file format - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _file The file identifier (required) * @param fileExport Export configuration information (required) * @return FileExported @@ -327,15 +345,16 @@ private okhttp3.Call handleExportFileValidateBeforeCall(String namespace, String 0 error response - */ - public FileExported handleExportFile(String namespace, String _file, FileExport fileExport) throws ApiException { - ApiResponse localVarResp = handleExportFileWithHttpInfo(namespace, _file, fileExport); + public FileExported handleExportFile(String workspace, String teamspace, String _file, FileExport fileExport) throws ApiException { + ApiResponse localVarResp = handleExportFileWithHttpInfo(workspace, teamspace, _file, fileExport); return localVarResp.getData(); } /** * * Export a TileDB File back to its original file format - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _file The file identifier (required) * @param fileExport Export configuration information (required) * @return ApiResponse<FileExported> @@ -348,8 +367,8 @@ public FileExported handleExportFile(String namespace, String _file, FileExport 0 error response - */ - public ApiResponse handleExportFileWithHttpInfo(String namespace, String _file, FileExport fileExport) throws ApiException { - okhttp3.Call localVarCall = handleExportFileValidateBeforeCall(namespace, _file, fileExport, null); + public ApiResponse handleExportFileWithHttpInfo(String workspace, String teamspace, String _file, FileExport fileExport) throws ApiException { + okhttp3.Call localVarCall = handleExportFileValidateBeforeCall(workspace, teamspace, _file, fileExport, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -357,7 +376,8 @@ public ApiResponse handleExportFileWithHttpInfo(String namespace, /** * (asynchronously) * Export a TileDB File back to its original file format - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _file The file identifier (required) * @param fileExport Export configuration information (required) * @param _callback The callback to be executed when the API call finishes @@ -371,16 +391,17 @@ public ApiResponse handleExportFileWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call handleExportFileAsync(String namespace, String _file, FileExport fileExport, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleExportFileAsync(String workspace, String teamspace, String _file, FileExport fileExport, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = handleExportFileValidateBeforeCall(namespace, _file, fileExport, _callback); + okhttp3.Call localVarCall = handleExportFileValidateBeforeCall(workspace, teamspace, _file, fileExport, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for handleUploadFile - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the file to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -396,7 +417,7 @@ public okhttp3.Call handleExportFileAsync(String namespace, String _file, FileEx 0 error response - */ - public okhttp3.Call handleUploadFileCall(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleUploadFileCall(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -413,8 +434,9 @@ public okhttp3.Call handleUploadFileCall(String namespace, File inputFile, Strin Object localVarPostBody = null; // create path and map variables - String localVarPath = "/files/{namespace}/upload" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/files/{workspace}/{teamspace}/upload" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -459,10 +481,15 @@ public okhttp3.Call handleUploadFileCall(String namespace, File inputFile, Strin } @SuppressWarnings("rawtypes") - private okhttp3.Call handleUploadFileValidateBeforeCall(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling handleUploadFile(Async)"); + private okhttp3.Call handleUploadFileValidateBeforeCall(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling handleUploadFile(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling handleUploadFile(Async)"); } // verify the required parameter 'inputFile' is set @@ -470,14 +497,15 @@ private okhttp3.Call handleUploadFileValidateBeforeCall(String namespace, File i throw new ApiException("Missing the required parameter 'inputFile' when calling handleUploadFile(Async)"); } - return handleUploadFileCall(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); + return handleUploadFileCall(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); } /** * * Upload a tiledb file at the specified location - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the file to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -492,15 +520,16 @@ private okhttp3.Call handleUploadFileValidateBeforeCall(String namespace, File i 0 error response - */ - public FileUploaded handleUploadFile(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { - ApiResponse localVarResp = handleUploadFileWithHttpInfo(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); + public FileUploaded handleUploadFile(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { + ApiResponse localVarResp = handleUploadFileWithHttpInfo(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); return localVarResp.getData(); } /** * * Upload a tiledb file at the specified location - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the file to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -515,8 +544,8 @@ public FileUploaded handleUploadFile(String namespace, File inputFile, String X_ 0 error response - */ - public ApiResponse handleUploadFileWithHttpInfo(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { - okhttp3.Call localVarCall = handleUploadFileValidateBeforeCall(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, null); + public ApiResponse handleUploadFileWithHttpInfo(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { + okhttp3.Call localVarCall = handleUploadFileValidateBeforeCall(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -524,7 +553,8 @@ public ApiResponse handleUploadFileWithHttpInfo(String namespace, /** * (asynchronously) * Upload a tiledb file at the specified location - * @param namespace The namespace of the file (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the file to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -540,9 +570,9 @@ public ApiResponse handleUploadFileWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call handleUploadFileAsync(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleUploadFileAsync(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = handleUploadFileValidateBeforeCall(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); + okhttp3.Call localVarCall = handleUploadFileValidateBeforeCall(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/GroupsApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/GroupsApi.java index c233bd1..d54b27c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/GroupsApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/GroupsApi.java @@ -86,7 +86,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for changeGroupContents - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupChanges (optional) * @param _callback Callback for upload/download progress @@ -100,7 +101,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call changeGroupContentsCall(String groupNamespace, String groupName, GroupChanges groupChanges, final ApiCallback _callback) throws ApiException { + public okhttp3.Call changeGroupContentsCall(String workspace, String teamspace, String groupName, GroupChanges groupChanges, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -117,8 +118,9 @@ public okhttp3.Call changeGroupContentsCall(String groupNamespace, String groupN Object localVarPostBody = groupChanges; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}/contents" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}/contents" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -148,10 +150,15 @@ public okhttp3.Call changeGroupContentsCall(String groupNamespace, String groupN } @SuppressWarnings("rawtypes") - private okhttp3.Call changeGroupContentsValidateBeforeCall(String groupNamespace, String groupName, GroupChanges groupChanges, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling changeGroupContents(Async)"); + private okhttp3.Call changeGroupContentsValidateBeforeCall(String workspace, String teamspace, String groupName, GroupChanges groupChanges, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling changeGroupContents(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling changeGroupContents(Async)"); } // verify the required parameter 'groupName' is set @@ -159,14 +166,15 @@ private okhttp3.Call changeGroupContentsValidateBeforeCall(String groupNamespace throw new ApiException("Missing the required parameter 'groupName' when calling changeGroupContents(Async)"); } - return changeGroupContentsCall(groupNamespace, groupName, groupChanges, _callback); + return changeGroupContentsCall(workspace, teamspace, groupName, groupChanges, _callback); } /** * * Changes the contents of the group by adding/removing members. - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupChanges (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -178,14 +186,15 @@ private okhttp3.Call changeGroupContentsValidateBeforeCall(String groupNamespace 0 error response - */ - public void changeGroupContents(String groupNamespace, String groupName, GroupChanges groupChanges) throws ApiException { - changeGroupContentsWithHttpInfo(groupNamespace, groupName, groupChanges); + public void changeGroupContents(String workspace, String teamspace, String groupName, GroupChanges groupChanges) throws ApiException { + changeGroupContentsWithHttpInfo(workspace, teamspace, groupName, groupChanges); } /** * * Changes the contents of the group by adding/removing members. - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupChanges (optional) * @return ApiResponse<Void> @@ -198,15 +207,16 @@ public void changeGroupContents(String groupNamespace, String groupName, GroupCh 0 error response - */ - public ApiResponse changeGroupContentsWithHttpInfo(String groupNamespace, String groupName, GroupChanges groupChanges) throws ApiException { - okhttp3.Call localVarCall = changeGroupContentsValidateBeforeCall(groupNamespace, groupName, groupChanges, null); + public ApiResponse changeGroupContentsWithHttpInfo(String workspace, String teamspace, String groupName, GroupChanges groupChanges) throws ApiException { + okhttp3.Call localVarCall = changeGroupContentsValidateBeforeCall(workspace, teamspace, groupName, groupChanges, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Changes the contents of the group by adding/removing members. - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupChanges (optional) * @param _callback The callback to be executed when the API call finishes @@ -220,15 +230,16 @@ public ApiResponse changeGroupContentsWithHttpInfo(String groupNamespace, 0 error response - */ - public okhttp3.Call changeGroupContentsAsync(String groupNamespace, String groupName, GroupChanges groupChanges, final ApiCallback _callback) throws ApiException { + public okhttp3.Call changeGroupContentsAsync(String workspace, String teamspace, String groupName, GroupChanges groupChanges, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = changeGroupContentsValidateBeforeCall(groupNamespace, groupName, groupChanges, _callback); + okhttp3.Call localVarCall = changeGroupContentsValidateBeforeCall(workspace, teamspace, groupName, groupChanges, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for createGroup - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupCreate (optional) * @param _callback Callback for upload/download progress * @return Call to execute @@ -241,7 +252,7 @@ public okhttp3.Call changeGroupContentsAsync(String groupNamespace, String group 0 error response - */ - public okhttp3.Call createGroupCall(String namespace, GroupCreate groupCreate, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createGroupCall(String workspace, String teamspace, GroupCreate groupCreate, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -258,8 +269,9 @@ public okhttp3.Call createGroupCall(String namespace, GroupCreate groupCreate, f Object localVarPostBody = groupCreate; // create path and map variables - String localVarPath = "/groups/{namespace}/create" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/groups/{workspace}/{teamspace}/create" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -288,20 +300,26 @@ public okhttp3.Call createGroupCall(String namespace, GroupCreate groupCreate, f } @SuppressWarnings("rawtypes") - private okhttp3.Call createGroupValidateBeforeCall(String namespace, GroupCreate groupCreate, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling createGroup(Async)"); + private okhttp3.Call createGroupValidateBeforeCall(String workspace, String teamspace, GroupCreate groupCreate, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling createGroup(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling createGroup(Async)"); } - return createGroupCall(namespace, groupCreate, _callback); + return createGroupCall(workspace, teamspace, groupCreate, _callback); } /** * * Creates a new group in the namespace. - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupCreate (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -312,14 +330,15 @@ private okhttp3.Call createGroupValidateBeforeCall(String namespace, GroupCreate 0 error response - */ - public void createGroup(String namespace, GroupCreate groupCreate) throws ApiException { - createGroupWithHttpInfo(namespace, groupCreate); + public void createGroup(String workspace, String teamspace, GroupCreate groupCreate) throws ApiException { + createGroupWithHttpInfo(workspace, teamspace, groupCreate); } /** * * Creates a new group in the namespace. - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupCreate (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -331,15 +350,16 @@ public void createGroup(String namespace, GroupCreate groupCreate) throws ApiExc 0 error response - */ - public ApiResponse createGroupWithHttpInfo(String namespace, GroupCreate groupCreate) throws ApiException { - okhttp3.Call localVarCall = createGroupValidateBeforeCall(namespace, groupCreate, null); + public ApiResponse createGroupWithHttpInfo(String workspace, String teamspace, GroupCreate groupCreate) throws ApiException { + okhttp3.Call localVarCall = createGroupValidateBeforeCall(workspace, teamspace, groupCreate, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Creates a new group in the namespace. - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupCreate (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -352,15 +372,16 @@ public ApiResponse createGroupWithHttpInfo(String namespace, GroupCreate g 0 error response - */ - public okhttp3.Call createGroupAsync(String namespace, GroupCreate groupCreate, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createGroupAsync(String workspace, String teamspace, GroupCreate groupCreate, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = createGroupValidateBeforeCall(namespace, groupCreate, _callback); + okhttp3.Call localVarCall = createGroupValidateBeforeCall(workspace, teamspace, groupCreate, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for deleteGroup - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -373,7 +394,7 @@ public okhttp3.Call createGroupAsync(String namespace, GroupCreate groupCreate, 0 error response - */ - public okhttp3.Call deleteGroupCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteGroupCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -390,8 +411,9 @@ public okhttp3.Call deleteGroupCall(String groupNamespace, String groupName, fin Object localVarPostBody = null; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -420,10 +442,15 @@ public okhttp3.Call deleteGroupCall(String groupNamespace, String groupName, fin } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteGroupValidateBeforeCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling deleteGroup(Async)"); + private okhttp3.Call deleteGroupValidateBeforeCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteGroup(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteGroup(Async)"); } // verify the required parameter 'groupName' is set @@ -431,14 +458,15 @@ private okhttp3.Call deleteGroupValidateBeforeCall(String groupNamespace, String throw new ApiException("Missing the required parameter 'groupName' when calling deleteGroup(Async)"); } - return deleteGroupCall(groupNamespace, groupName, _callback); + return deleteGroupCall(workspace, teamspace, groupName, _callback); } /** * * Deletes the group. The assets are not deleted nor are not relocated to any other group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -449,14 +477,15 @@ private okhttp3.Call deleteGroupValidateBeforeCall(String groupNamespace, String 0 error response - */ - public void deleteGroup(String groupNamespace, String groupName) throws ApiException { - deleteGroupWithHttpInfo(groupNamespace, groupName); + public void deleteGroup(String workspace, String teamspace, String groupName) throws ApiException { + deleteGroupWithHttpInfo(workspace, teamspace, groupName); } /** * * Deletes the group. The assets are not deleted nor are not relocated to any other group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -468,15 +497,16 @@ public void deleteGroup(String groupNamespace, String groupName) throws ApiExcep 0 error response - */ - public ApiResponse deleteGroupWithHttpInfo(String groupNamespace, String groupName) throws ApiException { - okhttp3.Call localVarCall = deleteGroupValidateBeforeCall(groupNamespace, groupName, null); + public ApiResponse deleteGroupWithHttpInfo(String workspace, String teamspace, String groupName) throws ApiException { + okhttp3.Call localVarCall = deleteGroupValidateBeforeCall(workspace, teamspace, groupName, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Deletes the group. The assets are not deleted nor are not relocated to any other group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -489,15 +519,16 @@ public ApiResponse deleteGroupWithHttpInfo(String groupNamespace, String g 0 error response - */ - public okhttp3.Call deleteGroupAsync(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteGroupAsync(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteGroupValidateBeforeCall(groupNamespace, groupName, _callback); + okhttp3.Call localVarCall = deleteGroupValidateBeforeCall(workspace, teamspace, groupName, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for getGroup - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -510,7 +541,7 @@ public okhttp3.Call deleteGroupAsync(String groupNamespace, String groupName, fi 0 error response - */ - public okhttp3.Call getGroupCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -527,8 +558,9 @@ public okhttp3.Call getGroupCall(String groupNamespace, String groupName, final Object localVarPostBody = null; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -557,10 +589,15 @@ public okhttp3.Call getGroupCall(String groupNamespace, String groupName, final } @SuppressWarnings("rawtypes") - private okhttp3.Call getGroupValidateBeforeCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling getGroup(Async)"); + private okhttp3.Call getGroupValidateBeforeCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getGroup(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getGroup(Async)"); } // verify the required parameter 'groupName' is set @@ -568,14 +605,15 @@ private okhttp3.Call getGroupValidateBeforeCall(String groupNamespace, String gr throw new ApiException("Missing the required parameter 'groupName' when calling getGroup(Async)"); } - return getGroupCall(groupNamespace, groupName, _callback); + return getGroupCall(workspace, teamspace, groupName, _callback); } /** * * Returns the the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return GroupInfo * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -587,15 +625,16 @@ private okhttp3.Call getGroupValidateBeforeCall(String groupNamespace, String gr 0 error response - */ - public GroupInfo getGroup(String groupNamespace, String groupName) throws ApiException { - ApiResponse localVarResp = getGroupWithHttpInfo(groupNamespace, groupName); + public GroupInfo getGroup(String workspace, String teamspace, String groupName) throws ApiException { + ApiResponse localVarResp = getGroupWithHttpInfo(workspace, teamspace, groupName); return localVarResp.getData(); } /** * * Returns the the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return ApiResponse<GroupInfo> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -607,8 +646,8 @@ public GroupInfo getGroup(String groupNamespace, String groupName) throws ApiExc 0 error response - */ - public ApiResponse getGroupWithHttpInfo(String groupNamespace, String groupName) throws ApiException { - okhttp3.Call localVarCall = getGroupValidateBeforeCall(groupNamespace, groupName, null); + public ApiResponse getGroupWithHttpInfo(String workspace, String teamspace, String groupName) throws ApiException { + okhttp3.Call localVarCall = getGroupValidateBeforeCall(workspace, teamspace, groupName, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -616,7 +655,8 @@ public ApiResponse getGroupWithHttpInfo(String groupNamespace, String /** * (asynchronously) * Returns the the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -629,16 +669,17 @@ public ApiResponse getGroupWithHttpInfo(String groupNamespace, String 0 error response - */ - public okhttp3.Call getGroupAsync(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupAsync(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getGroupValidateBeforeCall(groupNamespace, groupName, _callback); + okhttp3.Call localVarCall = getGroupValidateBeforeCall(workspace, teamspace, groupName, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getGroupActivity - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -653,7 +694,7 @@ public okhttp3.Call getGroupAsync(String groupNamespace, String groupName, final 0 error response - */ - public okhttp3.Call getGroupActivityCall(String groupNamespace, String groupName, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupActivityCall(String workspace, String teamspace, String groupName, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -670,8 +711,9 @@ public okhttp3.Call getGroupActivityCall(String groupNamespace, String groupName Object localVarPostBody = null; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}/content_activity" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}/content_activity" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -708,10 +750,15 @@ public okhttp3.Call getGroupActivityCall(String groupNamespace, String groupName } @SuppressWarnings("rawtypes") - private okhttp3.Call getGroupActivityValidateBeforeCall(String groupNamespace, String groupName, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling getGroupActivity(Async)"); + private okhttp3.Call getGroupActivityValidateBeforeCall(String workspace, String teamspace, String groupName, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getGroupActivity(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getGroupActivity(Async)"); } // verify the required parameter 'groupName' is set @@ -719,14 +766,15 @@ private okhttp3.Call getGroupActivityValidateBeforeCall(String groupNamespace, S throw new ApiException("Missing the required parameter 'groupName' when calling getGroupActivity(Async)"); } - return getGroupActivityCall(groupNamespace, groupName, page, perPage, _callback); + return getGroupActivityCall(workspace, teamspace, groupName, page, perPage, _callback); } /** * * Returns the activity of group content - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -740,15 +788,16 @@ private okhttp3.Call getGroupActivityValidateBeforeCall(String groupNamespace, S 0 error response - */ - public GroupContentActivityResponse getGroupActivity(String groupNamespace, String groupName, Integer page, Integer perPage) throws ApiException { - ApiResponse localVarResp = getGroupActivityWithHttpInfo(groupNamespace, groupName, page, perPage); + public GroupContentActivityResponse getGroupActivity(String workspace, String teamspace, String groupName, Integer page, Integer perPage) throws ApiException { + ApiResponse localVarResp = getGroupActivityWithHttpInfo(workspace, teamspace, groupName, page, perPage); return localVarResp.getData(); } /** * * Returns the activity of group content - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -762,8 +811,8 @@ public GroupContentActivityResponse getGroupActivity(String groupNamespace, Stri 0 error response - */ - public ApiResponse getGroupActivityWithHttpInfo(String groupNamespace, String groupName, Integer page, Integer perPage) throws ApiException { - okhttp3.Call localVarCall = getGroupActivityValidateBeforeCall(groupNamespace, groupName, page, perPage, null); + public ApiResponse getGroupActivityWithHttpInfo(String workspace, String teamspace, String groupName, Integer page, Integer perPage) throws ApiException { + okhttp3.Call localVarCall = getGroupActivityValidateBeforeCall(workspace, teamspace, groupName, page, perPage, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -771,7 +820,8 @@ public ApiResponse getGroupActivityWithHttpInfo(St /** * (asynchronously) * Returns the activity of group content - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -786,16 +836,17 @@ public ApiResponse getGroupActivityWithHttpInfo(St 0 error response - */ - public okhttp3.Call getGroupActivityAsync(String groupNamespace, String groupName, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupActivityAsync(String workspace, String teamspace, String groupName, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getGroupActivityValidateBeforeCall(groupNamespace, groupName, page, perPage, _callback); + okhttp3.Call localVarCall = getGroupActivityValidateBeforeCall(workspace, teamspace, groupName, page, perPage, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getGroupContents - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset for assets (optional) * @param perPage pagination limit for assets (optional) @@ -817,7 +868,7 @@ public okhttp3.Call getGroupActivityAsync(String groupNamespace, String groupNam 0 error response - */ - public okhttp3.Call getGroupContentsCall(String groupNamespace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupContentsCall(String workspace, String teamspace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -834,8 +885,9 @@ public okhttp3.Call getGroupContentsCall(String groupNamespace, String groupName Object localVarPostBody = null; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}/contents" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}/contents" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -900,10 +952,15 @@ public okhttp3.Call getGroupContentsCall(String groupNamespace, String groupName } @SuppressWarnings("rawtypes") - private okhttp3.Call getGroupContentsValidateBeforeCall(String groupNamespace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling getGroupContents(Async)"); + private okhttp3.Call getGroupContentsValidateBeforeCall(String workspace, String teamspace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getGroupContents(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getGroupContents(Async)"); } // verify the required parameter 'groupName' is set @@ -911,14 +968,15 @@ private okhttp3.Call getGroupContentsValidateBeforeCall(String groupNamespace, S throw new ApiException("Missing the required parameter 'groupName' when calling getGroupContents(Async)"); } - return getGroupContentsCall(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType, _callback); + return getGroupContentsCall(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType, _callback); } /** * * Returns the contents of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset for assets (optional) * @param perPage pagination limit for assets (optional) @@ -939,15 +997,16 @@ private okhttp3.Call getGroupContentsValidateBeforeCall(String groupNamespace, S 0 error response - */ - public GroupContents getGroupContents(String groupNamespace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType) throws ApiException { - ApiResponse localVarResp = getGroupContentsWithHttpInfo(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType); + public GroupContents getGroupContents(String workspace, String teamspace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType) throws ApiException { + ApiResponse localVarResp = getGroupContentsWithHttpInfo(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType); return localVarResp.getData(); } /** * * Returns the contents of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset for assets (optional) * @param perPage pagination limit for assets (optional) @@ -968,8 +1027,8 @@ public GroupContents getGroupContents(String groupNamespace, String groupName, I 0 error response - */ - public ApiResponse getGroupContentsWithHttpInfo(String groupNamespace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType) throws ApiException { - okhttp3.Call localVarCall = getGroupContentsValidateBeforeCall(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType, null); + public ApiResponse getGroupContentsWithHttpInfo(String workspace, String teamspace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType) throws ApiException { + okhttp3.Call localVarCall = getGroupContentsValidateBeforeCall(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -977,7 +1036,8 @@ public ApiResponse getGroupContentsWithHttpInfo(String groupNames /** * (asynchronously) * Returns the contents of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param page pagination offset for assets (optional) * @param perPage pagination limit for assets (optional) @@ -999,16 +1059,17 @@ public ApiResponse getGroupContentsWithHttpInfo(String groupNames 0 error response - */ - public okhttp3.Call getGroupContentsAsync(String groupNamespace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupContentsAsync(String workspace, String teamspace, String groupName, Integer page, Integer perPage, String namespace, String search, String orderby, List tag, List excludeTag, List memberType, List excludeMemberType, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getGroupContentsValidateBeforeCall(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType, _callback); + okhttp3.Call localVarCall = getGroupContentsValidateBeforeCall(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getGroupSharingPolicies - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1022,7 +1083,7 @@ public okhttp3.Call getGroupContentsAsync(String groupNamespace, String groupNam 0 error response - */ - public okhttp3.Call getGroupSharingPoliciesCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getGroupSharingPoliciesCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1039,8 +1100,9 @@ public okhttp3.Call getGroupSharingPoliciesCall(String groupNamespace, String gr Object localVarPostBody = null; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}/share" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -1069,10 +1131,15 @@ public okhttp3.Call getGroupSharingPoliciesCall(String groupNamespace, String gr } @SuppressWarnings("rawtypes") - private okhttp3.Call getGroupSharingPoliciesValidateBeforeCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling getGroupSharingPolicies(Async)"); + private okhttp3.Call getGroupSharingPoliciesValidateBeforeCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getGroupSharingPolicies(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getGroupSharingPolicies(Async)"); } // verify the required parameter 'groupName' is set @@ -1080,14 +1147,15 @@ private okhttp3.Call getGroupSharingPoliciesValidateBeforeCall(String groupNames throw new ApiException("Missing the required parameter 'groupName' when calling getGroupSharingPolicies(Async)"); } - return getGroupSharingPoliciesCall(groupNamespace, groupName, _callback); + return getGroupSharingPoliciesCall(workspace, teamspace, groupName, _callback); } /** * * Get all sharing details of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return List<GroupSharing> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1100,15 +1168,16 @@ private okhttp3.Call getGroupSharingPoliciesValidateBeforeCall(String groupNames 0 error response - */ - public List getGroupSharingPolicies(String groupNamespace, String groupName) throws ApiException { - ApiResponse> localVarResp = getGroupSharingPoliciesWithHttpInfo(groupNamespace, groupName); + public List getGroupSharingPolicies(String workspace, String teamspace, String groupName) throws ApiException { + ApiResponse> localVarResp = getGroupSharingPoliciesWithHttpInfo(workspace, teamspace, groupName); return localVarResp.getData(); } /** * * Get all sharing details of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return ApiResponse<List<GroupSharing>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1121,8 +1190,8 @@ public List getGroupSharingPolicies(String groupNamespace, String 0 error response - */ - public ApiResponse> getGroupSharingPoliciesWithHttpInfo(String groupNamespace, String groupName) throws ApiException { - okhttp3.Call localVarCall = getGroupSharingPoliciesValidateBeforeCall(groupNamespace, groupName, null); + public ApiResponse> getGroupSharingPoliciesWithHttpInfo(String workspace, String teamspace, String groupName) throws ApiException { + okhttp3.Call localVarCall = getGroupSharingPoliciesValidateBeforeCall(workspace, teamspace, groupName, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1130,7 +1199,8 @@ public ApiResponse> getGroupSharingPoliciesWithHttpInfo(Strin /** * (asynchronously) * Get all sharing details of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1144,9 +1214,9 @@ public ApiResponse> getGroupSharingPoliciesWithHttpInfo(Strin 0 error response - */ - public okhttp3.Call getGroupSharingPoliciesAsync(String groupNamespace, String groupName, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getGroupSharingPoliciesAsync(String workspace, String teamspace, String groupName, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getGroupSharingPoliciesValidateBeforeCall(groupNamespace, groupName, _callback); + okhttp3.Call localVarCall = getGroupSharingPoliciesValidateBeforeCall(workspace, teamspace, groupName, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -1531,8 +1601,9 @@ public okhttp3.Call groupsBrowserSharedFiltersGetAsync(String namespace, final A return localVarCall; } /** - * Build call for groupsGroupNamespaceGroupNameContentsFiltersGet - * @param groupNamespace The namespace of the group (required) + * Build call for groupsWorkspaceTeamspaceGroupNameContentsFiltersGet + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1545,7 +1616,7 @@ public okhttp3.Call groupsBrowserSharedFiltersGetAsync(String namespace, final A 0 error response - */ - public okhttp3.Call groupsGroupNamespaceGroupNameContentsFiltersGetCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call groupsWorkspaceTeamspaceGroupNameContentsFiltersGetCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1562,8 +1633,9 @@ public okhttp3.Call groupsGroupNamespaceGroupNameContentsFiltersGetCall(String g Object localVarPostBody = null; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}/contents/filters" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}/contents/filters" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -1592,25 +1664,31 @@ public okhttp3.Call groupsGroupNamespaceGroupNameContentsFiltersGetCall(String g } @SuppressWarnings("rawtypes") - private okhttp3.Call groupsGroupNamespaceGroupNameContentsFiltersGetValidateBeforeCall(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling groupsGroupNamespaceGroupNameContentsFiltersGet(Async)"); + private okhttp3.Call groupsWorkspaceTeamspaceGroupNameContentsFiltersGetValidateBeforeCall(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(Async)"); } // verify the required parameter 'groupName' is set if (groupName == null) { - throw new ApiException("Missing the required parameter 'groupName' when calling groupsGroupNamespaceGroupNameContentsFiltersGet(Async)"); + throw new ApiException("Missing the required parameter 'groupName' when calling groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(Async)"); } - return groupsGroupNamespaceGroupNameContentsFiltersGetCall(groupNamespace, groupName, _callback); + return groupsWorkspaceTeamspaceGroupNameContentsFiltersGetCall(workspace, teamspace, groupName, _callback); } /** * * Fetch data to initialize filters for the group contents - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return GroupContentsFilterData * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1622,15 +1700,16 @@ private okhttp3.Call groupsGroupNamespaceGroupNameContentsFiltersGetValidateBefo 0 error response - */ - public GroupContentsFilterData groupsGroupNamespaceGroupNameContentsFiltersGet(String groupNamespace, String groupName) throws ApiException { - ApiResponse localVarResp = groupsGroupNamespaceGroupNameContentsFiltersGetWithHttpInfo(groupNamespace, groupName); + public GroupContentsFilterData groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(String workspace, String teamspace, String groupName) throws ApiException { + ApiResponse localVarResp = groupsWorkspaceTeamspaceGroupNameContentsFiltersGetWithHttpInfo(workspace, teamspace, groupName); return localVarResp.getData(); } /** * * Fetch data to initialize filters for the group contents - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @return ApiResponse<GroupContentsFilterData> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1642,8 +1721,8 @@ public GroupContentsFilterData groupsGroupNamespaceGroupNameContentsFiltersGet(S 0 error response - */ - public ApiResponse groupsGroupNamespaceGroupNameContentsFiltersGetWithHttpInfo(String groupNamespace, String groupName) throws ApiException { - okhttp3.Call localVarCall = groupsGroupNamespaceGroupNameContentsFiltersGetValidateBeforeCall(groupNamespace, groupName, null); + public ApiResponse groupsWorkspaceTeamspaceGroupNameContentsFiltersGetWithHttpInfo(String workspace, String teamspace, String groupName) throws ApiException { + okhttp3.Call localVarCall = groupsWorkspaceTeamspaceGroupNameContentsFiltersGetValidateBeforeCall(workspace, teamspace, groupName, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1651,7 +1730,8 @@ public ApiResponse groupsGroupNamespaceGroupNameContent /** * (asynchronously) * Fetch data to initialize filters for the group contents - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1664,9 +1744,9 @@ public ApiResponse groupsGroupNamespaceGroupNameContent 0 error response - */ - public okhttp3.Call groupsGroupNamespaceGroupNameContentsFiltersGetAsync(String groupNamespace, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call groupsWorkspaceTeamspaceGroupNameContentsFiltersGetAsync(String workspace, String teamspace, String groupName, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = groupsGroupNamespaceGroupNameContentsFiltersGetValidateBeforeCall(groupNamespace, groupName, _callback); + okhttp3.Call localVarCall = groupsWorkspaceTeamspaceGroupNameContentsFiltersGetValidateBeforeCall(workspace, teamspace, groupName, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -2332,7 +2412,8 @@ public okhttp3.Call listSharedGroupsAsync(Integer page, Integer perPage, String } /** * Build call for registerGroup - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The unique name or id of the group (required) * @param groupRegister (optional) * @param _callback Callback for upload/download progress @@ -2346,7 +2427,7 @@ public okhttp3.Call listSharedGroupsAsync(Integer page, Integer perPage, String 0 error response - */ - public okhttp3.Call registerGroupCall(String namespace, String array, GroupRegister groupRegister, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerGroupCall(String workspace, String teamspace, String array, GroupRegister groupRegister, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2363,8 +2444,9 @@ public okhttp3.Call registerGroupCall(String namespace, String array, GroupRegis Object localVarPostBody = groupRegister; // create path and map variables - String localVarPath = "/groups/{namespace}/{array}/register" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{array}/register" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -2394,10 +2476,15 @@ public okhttp3.Call registerGroupCall(String namespace, String array, GroupRegis } @SuppressWarnings("rawtypes") - private okhttp3.Call registerGroupValidateBeforeCall(String namespace, String array, GroupRegister groupRegister, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling registerGroup(Async)"); + private okhttp3.Call registerGroupValidateBeforeCall(String workspace, String teamspace, String array, GroupRegister groupRegister, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling registerGroup(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling registerGroup(Async)"); } // verify the required parameter 'array' is set @@ -2405,14 +2492,15 @@ private okhttp3.Call registerGroupValidateBeforeCall(String namespace, String ar throw new ApiException("Missing the required parameter 'array' when calling registerGroup(Async)"); } - return registerGroupCall(namespace, array, groupRegister, _callback); + return registerGroupCall(workspace, teamspace, array, groupRegister, _callback); } /** * * Registers an existing group in the namespace. - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The unique name or id of the group (required) * @param groupRegister (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -2424,14 +2512,15 @@ private okhttp3.Call registerGroupValidateBeforeCall(String namespace, String ar 0 error response - */ - public void registerGroup(String namespace, String array, GroupRegister groupRegister) throws ApiException { - registerGroupWithHttpInfo(namespace, array, groupRegister); + public void registerGroup(String workspace, String teamspace, String array, GroupRegister groupRegister) throws ApiException { + registerGroupWithHttpInfo(workspace, teamspace, array, groupRegister); } /** * * Registers an existing group in the namespace. - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The unique name or id of the group (required) * @param groupRegister (optional) * @return ApiResponse<Void> @@ -2444,15 +2533,16 @@ public void registerGroup(String namespace, String array, GroupRegister groupReg 0 error response - */ - public ApiResponse registerGroupWithHttpInfo(String namespace, String array, GroupRegister groupRegister) throws ApiException { - okhttp3.Call localVarCall = registerGroupValidateBeforeCall(namespace, array, groupRegister, null); + public ApiResponse registerGroupWithHttpInfo(String workspace, String teamspace, String array, GroupRegister groupRegister) throws ApiException { + okhttp3.Call localVarCall = registerGroupValidateBeforeCall(workspace, teamspace, array, groupRegister, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Registers an existing group in the namespace. - * @param namespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The unique name or id of the group (required) * @param groupRegister (optional) * @param _callback The callback to be executed when the API call finishes @@ -2466,15 +2556,16 @@ public ApiResponse registerGroupWithHttpInfo(String namespace, String arra 0 error response - */ - public okhttp3.Call registerGroupAsync(String namespace, String array, GroupRegister groupRegister, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerGroupAsync(String workspace, String teamspace, String array, GroupRegister groupRegister, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = registerGroupValidateBeforeCall(namespace, array, groupRegister, _callback); + okhttp3.Call localVarCall = registerGroupValidateBeforeCall(workspace, teamspace, array, groupRegister, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for shareGroup - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupSharingRequest Namespace and list of permissions to share with. Sharing is recursive, it is applied to all reachable subgroups and arrays of the group. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the group will not be shared with the namespace at all. (required) * @param _callback Callback for upload/download progress @@ -2489,7 +2580,7 @@ public okhttp3.Call registerGroupAsync(String namespace, String array, GroupRegi 0 error response - */ - public okhttp3.Call shareGroupCall(String groupNamespace, String groupName, GroupSharingRequest groupSharingRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareGroupCall(String workspace, String teamspace, String groupName, GroupSharingRequest groupSharingRequest, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2506,8 +2597,9 @@ public okhttp3.Call shareGroupCall(String groupNamespace, String groupName, Grou Object localVarPostBody = groupSharingRequest; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}/share" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -2537,10 +2629,15 @@ public okhttp3.Call shareGroupCall(String groupNamespace, String groupName, Grou } @SuppressWarnings("rawtypes") - private okhttp3.Call shareGroupValidateBeforeCall(String groupNamespace, String groupName, GroupSharingRequest groupSharingRequest, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling shareGroup(Async)"); + private okhttp3.Call shareGroupValidateBeforeCall(String workspace, String teamspace, String groupName, GroupSharingRequest groupSharingRequest, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shareGroup(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling shareGroup(Async)"); } // verify the required parameter 'groupName' is set @@ -2553,14 +2650,15 @@ private okhttp3.Call shareGroupValidateBeforeCall(String groupNamespace, String throw new ApiException("Missing the required parameter 'groupSharingRequest' when calling shareGroup(Async)"); } - return shareGroupCall(groupNamespace, groupName, groupSharingRequest, _callback); + return shareGroupCall(workspace, teamspace, groupName, groupSharingRequest, _callback); } /** * * Share a group with a namespace - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupSharingRequest Namespace and list of permissions to share with. Sharing is recursive, it is applied to all reachable subgroups and arrays of the group. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the group will not be shared with the namespace at all. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -2573,14 +2671,15 @@ private okhttp3.Call shareGroupValidateBeforeCall(String groupNamespace, String 0 error response - */ - public void shareGroup(String groupNamespace, String groupName, GroupSharingRequest groupSharingRequest) throws ApiException { - shareGroupWithHttpInfo(groupNamespace, groupName, groupSharingRequest); + public void shareGroup(String workspace, String teamspace, String groupName, GroupSharingRequest groupSharingRequest) throws ApiException { + shareGroupWithHttpInfo(workspace, teamspace, groupName, groupSharingRequest); } /** * * Share a group with a namespace - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupSharingRequest Namespace and list of permissions to share with. Sharing is recursive, it is applied to all reachable subgroups and arrays of the group. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the group will not be shared with the namespace at all. (required) * @return ApiResponse<Void> @@ -2594,15 +2693,16 @@ public void shareGroup(String groupNamespace, String groupName, GroupSharingRequ 0 error response - */ - public ApiResponse shareGroupWithHttpInfo(String groupNamespace, String groupName, GroupSharingRequest groupSharingRequest) throws ApiException { - okhttp3.Call localVarCall = shareGroupValidateBeforeCall(groupNamespace, groupName, groupSharingRequest, null); + public ApiResponse shareGroupWithHttpInfo(String workspace, String teamspace, String groupName, GroupSharingRequest groupSharingRequest) throws ApiException { + okhttp3.Call localVarCall = shareGroupValidateBeforeCall(workspace, teamspace, groupName, groupSharingRequest, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Share a group with a namespace - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupSharingRequest Namespace and list of permissions to share with. Sharing is recursive, it is applied to all reachable subgroups and arrays of the group. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the group will not be shared with the namespace at all. (required) * @param _callback The callback to be executed when the API call finishes @@ -2617,15 +2717,16 @@ public ApiResponse shareGroupWithHttpInfo(String groupNamespace, String gr 0 error response - */ - public okhttp3.Call shareGroupAsync(String groupNamespace, String groupName, GroupSharingRequest groupSharingRequest, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareGroupAsync(String workspace, String teamspace, String groupName, GroupSharingRequest groupSharingRequest, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shareGroupValidateBeforeCall(groupNamespace, groupName, groupSharingRequest, _callback); + okhttp3.Call localVarCall = shareGroupValidateBeforeCall(workspace, teamspace, groupName, groupSharingRequest, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for updateGroup - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupUpdate (optional) * @param _callback Callback for upload/download progress @@ -2639,7 +2740,7 @@ public okhttp3.Call shareGroupAsync(String groupNamespace, String groupName, Gro 0 error response - */ - public okhttp3.Call updateGroupCall(String groupNamespace, String groupName, GroupUpdate groupUpdate, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateGroupCall(String workspace, String teamspace, String groupName, GroupUpdate groupUpdate, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2656,8 +2757,9 @@ public okhttp3.Call updateGroupCall(String groupNamespace, String groupName, Gro Object localVarPostBody = groupUpdate; // create path and map variables - String localVarPath = "/groups/{group_namespace}/{group_name}" - .replace("{" + "group_namespace" + "}", localVarApiClient.escapeString(groupNamespace.toString())) + String localVarPath = "/groups/{workspace}/{teamspace}/{group_name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); List localVarQueryParams = new ArrayList(); @@ -2687,10 +2789,15 @@ public okhttp3.Call updateGroupCall(String groupNamespace, String groupName, Gro } @SuppressWarnings("rawtypes") - private okhttp3.Call updateGroupValidateBeforeCall(String groupNamespace, String groupName, GroupUpdate groupUpdate, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'groupNamespace' is set - if (groupNamespace == null) { - throw new ApiException("Missing the required parameter 'groupNamespace' when calling updateGroup(Async)"); + private okhttp3.Call updateGroupValidateBeforeCall(String workspace, String teamspace, String groupName, GroupUpdate groupUpdate, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateGroup(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling updateGroup(Async)"); } // verify the required parameter 'groupName' is set @@ -2698,14 +2805,15 @@ private okhttp3.Call updateGroupValidateBeforeCall(String groupNamespace, String throw new ApiException("Missing the required parameter 'groupName' when calling updateGroup(Async)"); } - return updateGroupCall(groupNamespace, groupName, groupUpdate, _callback); + return updateGroupCall(workspace, teamspace, groupName, groupUpdate, _callback); } /** * * Changes attributes of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupUpdate (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -2717,14 +2825,15 @@ private okhttp3.Call updateGroupValidateBeforeCall(String groupNamespace, String 0 error response - */ - public void updateGroup(String groupNamespace, String groupName, GroupUpdate groupUpdate) throws ApiException { - updateGroupWithHttpInfo(groupNamespace, groupName, groupUpdate); + public void updateGroup(String workspace, String teamspace, String groupName, GroupUpdate groupUpdate) throws ApiException { + updateGroupWithHttpInfo(workspace, teamspace, groupName, groupUpdate); } /** * * Changes attributes of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupUpdate (optional) * @return ApiResponse<Void> @@ -2737,15 +2846,16 @@ public void updateGroup(String groupNamespace, String groupName, GroupUpdate gro 0 error response - */ - public ApiResponse updateGroupWithHttpInfo(String groupNamespace, String groupName, GroupUpdate groupUpdate) throws ApiException { - okhttp3.Call localVarCall = updateGroupValidateBeforeCall(groupNamespace, groupName, groupUpdate, null); + public ApiResponse updateGroupWithHttpInfo(String workspace, String teamspace, String groupName, GroupUpdate groupUpdate) throws ApiException { + okhttp3.Call localVarCall = updateGroupValidateBeforeCall(workspace, teamspace, groupName, groupUpdate, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Changes attributes of the group - * @param groupNamespace The namespace of the group (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param groupName The unique name or id of the group (required) * @param groupUpdate (optional) * @param _callback The callback to be executed when the API call finishes @@ -2759,9 +2869,9 @@ public ApiResponse updateGroupWithHttpInfo(String groupNamespace, String g 0 error response - */ - public okhttp3.Call updateGroupAsync(String groupNamespace, String groupName, GroupUpdate groupUpdate, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateGroupAsync(String workspace, String teamspace, String groupName, GroupUpdate groupUpdate, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateGroupValidateBeforeCall(groupNamespace, groupName, groupUpdate, _callback); + okhttp3.Call localVarCall = updateGroupValidateBeforeCall(workspace, teamspace, groupName, groupUpdate, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/InvitationApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/InvitationApi.java index a7f715a..006fcb1 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/InvitationApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/InvitationApi.java @@ -352,7 +352,8 @@ public okhttp3.Call cancelJoinOrganizationAsync(String invitation, String organi } /** * Build call for cancelShareArrayByInvite - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param array name/uri of array that is url-encoded (required) * @param _callback Callback for upload/download progress @@ -367,7 +368,7 @@ public okhttp3.Call cancelJoinOrganizationAsync(String invitation, String organi 0 error response - */ - public okhttp3.Call cancelShareArrayByInviteCall(String namespace, String invitation, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call cancelShareArrayByInviteCall(String workspace, String teamspace, String invitation, String array, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -384,8 +385,9 @@ public okhttp3.Call cancelShareArrayByInviteCall(String namespace, String invita Object localVarPostBody = null; // create path and map variables - String localVarPath = "/invitations/{invitation}/{namespace}/{array}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/invitations/{invitation}/{workspace}/{teamspace}/{array}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "invitation" + "}", localVarApiClient.escapeString(invitation.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); @@ -415,10 +417,15 @@ public okhttp3.Call cancelShareArrayByInviteCall(String namespace, String invita } @SuppressWarnings("rawtypes") - private okhttp3.Call cancelShareArrayByInviteValidateBeforeCall(String namespace, String invitation, String array, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling cancelShareArrayByInvite(Async)"); + private okhttp3.Call cancelShareArrayByInviteValidateBeforeCall(String workspace, String teamspace, String invitation, String array, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling cancelShareArrayByInvite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling cancelShareArrayByInvite(Async)"); } // verify the required parameter 'invitation' is set @@ -431,14 +438,15 @@ private okhttp3.Call cancelShareArrayByInviteValidateBeforeCall(String namespace throw new ApiException("Missing the required parameter 'array' when calling cancelShareArrayByInvite(Async)"); } - return cancelShareArrayByInviteCall(namespace, invitation, array, _callback); + return cancelShareArrayByInviteCall(workspace, teamspace, invitation, array, _callback); } /** * * Cancels array sharing invitation - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param array name/uri of array that is url-encoded (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -451,14 +459,15 @@ private okhttp3.Call cancelShareArrayByInviteValidateBeforeCall(String namespace 0 error response - */ - public void cancelShareArrayByInvite(String namespace, String invitation, String array) throws ApiException { - cancelShareArrayByInviteWithHttpInfo(namespace, invitation, array); + public void cancelShareArrayByInvite(String workspace, String teamspace, String invitation, String array) throws ApiException { + cancelShareArrayByInviteWithHttpInfo(workspace, teamspace, invitation, array); } /** * * Cancels array sharing invitation - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param array name/uri of array that is url-encoded (required) * @return ApiResponse<Void> @@ -472,15 +481,16 @@ public void cancelShareArrayByInvite(String namespace, String invitation, String 0 error response - */ - public ApiResponse cancelShareArrayByInviteWithHttpInfo(String namespace, String invitation, String array) throws ApiException { - okhttp3.Call localVarCall = cancelShareArrayByInviteValidateBeforeCall(namespace, invitation, array, null); + public ApiResponse cancelShareArrayByInviteWithHttpInfo(String workspace, String teamspace, String invitation, String array) throws ApiException { + okhttp3.Call localVarCall = cancelShareArrayByInviteValidateBeforeCall(workspace, teamspace, invitation, array, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Cancels array sharing invitation - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param array name/uri of array that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes @@ -495,15 +505,16 @@ public ApiResponse cancelShareArrayByInviteWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call cancelShareArrayByInviteAsync(String namespace, String invitation, String array, final ApiCallback _callback) throws ApiException { + public okhttp3.Call cancelShareArrayByInviteAsync(String workspace, String teamspace, String invitation, String array, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = cancelShareArrayByInviteValidateBeforeCall(namespace, invitation, array, _callback); + okhttp3.Call localVarCall = cancelShareArrayByInviteValidateBeforeCall(workspace, teamspace, invitation, array, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for cancelShareGroupByInvite - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param groupName name/uuid of group that is url-encoded (required) * @param _callback Callback for upload/download progress @@ -518,7 +529,7 @@ public okhttp3.Call cancelShareArrayByInviteAsync(String namespace, String invit 0 error response - */ - public okhttp3.Call cancelShareGroupByInviteCall(String namespace, String invitation, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call cancelShareGroupByInviteCall(String workspace, String teamspace, String invitation, String groupName, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -535,8 +546,9 @@ public okhttp3.Call cancelShareGroupByInviteCall(String namespace, String invita Object localVarPostBody = null; // create path and map variables - String localVarPath = "/invitations/group/{invitation}/{namespace}/{group_name}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/invitations/group/{invitation}/{workspace}/{teamspace}/{group_name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "invitation" + "}", localVarApiClient.escapeString(invitation.toString())) .replace("{" + "group_name" + "}", localVarApiClient.escapeString(groupName.toString())); @@ -566,10 +578,15 @@ public okhttp3.Call cancelShareGroupByInviteCall(String namespace, String invita } @SuppressWarnings("rawtypes") - private okhttp3.Call cancelShareGroupByInviteValidateBeforeCall(String namespace, String invitation, String groupName, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling cancelShareGroupByInvite(Async)"); + private okhttp3.Call cancelShareGroupByInviteValidateBeforeCall(String workspace, String teamspace, String invitation, String groupName, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling cancelShareGroupByInvite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling cancelShareGroupByInvite(Async)"); } // verify the required parameter 'invitation' is set @@ -582,14 +599,15 @@ private okhttp3.Call cancelShareGroupByInviteValidateBeforeCall(String namespace throw new ApiException("Missing the required parameter 'groupName' when calling cancelShareGroupByInvite(Async)"); } - return cancelShareGroupByInviteCall(namespace, invitation, groupName, _callback); + return cancelShareGroupByInviteCall(workspace, teamspace, invitation, groupName, _callback); } /** * * Cancels group sharing invitation - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param groupName name/uuid of group that is url-encoded (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -602,14 +620,15 @@ private okhttp3.Call cancelShareGroupByInviteValidateBeforeCall(String namespace 0 error response - */ - public void cancelShareGroupByInvite(String namespace, String invitation, String groupName) throws ApiException { - cancelShareGroupByInviteWithHttpInfo(namespace, invitation, groupName); + public void cancelShareGroupByInvite(String workspace, String teamspace, String invitation, String groupName) throws ApiException { + cancelShareGroupByInviteWithHttpInfo(workspace, teamspace, invitation, groupName); } /** * * Cancels group sharing invitation - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param groupName name/uuid of group that is url-encoded (required) * @return ApiResponse<Void> @@ -623,15 +642,16 @@ public void cancelShareGroupByInvite(String namespace, String invitation, String 0 error response - */ - public ApiResponse cancelShareGroupByInviteWithHttpInfo(String namespace, String invitation, String groupName) throws ApiException { - okhttp3.Call localVarCall = cancelShareGroupByInviteValidateBeforeCall(namespace, invitation, groupName, null); + public ApiResponse cancelShareGroupByInviteWithHttpInfo(String workspace, String teamspace, String invitation, String groupName) throws ApiException { + okhttp3.Call localVarCall = cancelShareGroupByInviteValidateBeforeCall(workspace, teamspace, invitation, groupName, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Cancels group sharing invitation - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param invitation the ID of invitation about to be cancelled (required) * @param groupName name/uuid of group that is url-encoded (required) * @param _callback The callback to be executed when the API call finishes @@ -646,15 +666,16 @@ public ApiResponse cancelShareGroupByInviteWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call cancelShareGroupByInviteAsync(String namespace, String invitation, String groupName, final ApiCallback _callback) throws ApiException { + public okhttp3.Call cancelShareGroupByInviteAsync(String workspace, String teamspace, String invitation, String groupName, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = cancelShareGroupByInviteValidateBeforeCall(namespace, invitation, groupName, _callback); + okhttp3.Call localVarCall = cancelShareGroupByInviteValidateBeforeCall(workspace, teamspace, invitation, groupName, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for cancelSharePayment - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param target name or UUID of recipient namespace (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -667,7 +688,7 @@ public okhttp3.Call cancelShareGroupByInviteAsync(String namespace, String invit 0 error response - */ - public okhttp3.Call cancelSharePaymentCall(String namespace, String target, final ApiCallback _callback) throws ApiException { + public okhttp3.Call cancelSharePaymentCall(String workspace, String teamspace, String target, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -684,8 +705,9 @@ public okhttp3.Call cancelSharePaymentCall(String namespace, String target, fina Object localVarPostBody = null; // create path and map variables - String localVarPath = "/invitations/share_payment/{namespace}/{target}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/invitations/share_payment/{workspace}/{teamspace}/{target}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "target" + "}", localVarApiClient.escapeString(target.toString())); List localVarQueryParams = new ArrayList(); @@ -714,10 +736,15 @@ public okhttp3.Call cancelSharePaymentCall(String namespace, String target, fina } @SuppressWarnings("rawtypes") - private okhttp3.Call cancelSharePaymentValidateBeforeCall(String namespace, String target, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling cancelSharePayment(Async)"); + private okhttp3.Call cancelSharePaymentValidateBeforeCall(String workspace, String teamspace, String target, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling cancelSharePayment(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling cancelSharePayment(Async)"); } // verify the required parameter 'target' is set @@ -725,14 +752,15 @@ private okhttp3.Call cancelSharePaymentValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'target' when calling cancelSharePayment(Async)"); } - return cancelSharePaymentCall(namespace, target, _callback); + return cancelSharePaymentCall(workspace, teamspace, target, _callback); } /** * * Revokes invitation from the source namespace to the target. - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param target name or UUID of recipient namespace (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -743,14 +771,15 @@ private okhttp3.Call cancelSharePaymentValidateBeforeCall(String namespace, Stri 0 error response - */ - public void cancelSharePayment(String namespace, String target) throws ApiException { - cancelSharePaymentWithHttpInfo(namespace, target); + public void cancelSharePayment(String workspace, String teamspace, String target) throws ApiException { + cancelSharePaymentWithHttpInfo(workspace, teamspace, target); } /** * * Revokes invitation from the source namespace to the target. - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param target name or UUID of recipient namespace (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -762,15 +791,16 @@ public void cancelSharePayment(String namespace, String target) throws ApiExcept 0 error response - */ - public ApiResponse cancelSharePaymentWithHttpInfo(String namespace, String target) throws ApiException { - okhttp3.Call localVarCall = cancelSharePaymentValidateBeforeCall(namespace, target, null); + public ApiResponse cancelSharePaymentWithHttpInfo(String workspace, String teamspace, String target) throws ApiException { + okhttp3.Call localVarCall = cancelSharePaymentValidateBeforeCall(workspace, teamspace, target, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Revokes invitation from the source namespace to the target. - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param target name or UUID of recipient namespace (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -783,9 +813,9 @@ public ApiResponse cancelSharePaymentWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call cancelSharePaymentAsync(String namespace, String target, final ApiCallback _callback) throws ApiException { + public okhttp3.Call cancelSharePaymentAsync(String workspace, String teamspace, String target, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = cancelSharePaymentValidateBeforeCall(namespace, target, _callback); + okhttp3.Call localVarCall = cancelSharePaymentValidateBeforeCall(workspace, teamspace, target, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } @@ -1137,7 +1167,8 @@ public okhttp3.Call joinOrganizationAsync(String organization, InvitationOrganiz } /** * Build call for shareArrayByInvite - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param emailInvite list of email recipients (required) * @param _callback Callback for upload/download progress @@ -1153,7 +1184,7 @@ public okhttp3.Call joinOrganizationAsync(String organization, InvitationOrganiz 0 error response - */ - public okhttp3.Call shareArrayByInviteCall(String namespace, String array, InvitationArrayShareEmail emailInvite, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareArrayByInviteCall(String workspace, String teamspace, String array, InvitationArrayShareEmail emailInvite, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1170,8 +1201,9 @@ public okhttp3.Call shareArrayByInviteCall(String namespace, String array, Invit Object localVarPostBody = emailInvite; // create path and map variables - String localVarPath = "/invitations/{namespace}/{array}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/invitations/{workspace}/{teamspace}/{array}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1201,10 +1233,15 @@ public okhttp3.Call shareArrayByInviteCall(String namespace, String array, Invit } @SuppressWarnings("rawtypes") - private okhttp3.Call shareArrayByInviteValidateBeforeCall(String namespace, String array, InvitationArrayShareEmail emailInvite, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling shareArrayByInvite(Async)"); + private okhttp3.Call shareArrayByInviteValidateBeforeCall(String workspace, String teamspace, String array, InvitationArrayShareEmail emailInvite, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shareArrayByInvite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling shareArrayByInvite(Async)"); } // verify the required parameter 'array' is set @@ -1217,14 +1254,15 @@ private okhttp3.Call shareArrayByInviteValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'emailInvite' when calling shareArrayByInvite(Async)"); } - return shareArrayByInviteCall(namespace, array, emailInvite, _callback); + return shareArrayByInviteCall(workspace, teamspace, array, emailInvite, _callback); } /** * * Sends email to multiple recipients with sharing information regarding an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param emailInvite list of email recipients (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1238,14 +1276,15 @@ private okhttp3.Call shareArrayByInviteValidateBeforeCall(String namespace, Stri 0 error response - */ - public void shareArrayByInvite(String namespace, String array, InvitationArrayShareEmail emailInvite) throws ApiException { - shareArrayByInviteWithHttpInfo(namespace, array, emailInvite); + public void shareArrayByInvite(String workspace, String teamspace, String array, InvitationArrayShareEmail emailInvite) throws ApiException { + shareArrayByInviteWithHttpInfo(workspace, teamspace, array, emailInvite); } /** * * Sends email to multiple recipients with sharing information regarding an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param emailInvite list of email recipients (required) * @return ApiResponse<Void> @@ -1260,15 +1299,16 @@ public void shareArrayByInvite(String namespace, String array, InvitationArraySh 0 error response - */ - public ApiResponse shareArrayByInviteWithHttpInfo(String namespace, String array, InvitationArrayShareEmail emailInvite) throws ApiException { - okhttp3.Call localVarCall = shareArrayByInviteValidateBeforeCall(namespace, array, emailInvite, null); + public ApiResponse shareArrayByInviteWithHttpInfo(String workspace, String teamspace, String array, InvitationArrayShareEmail emailInvite) throws ApiException { + okhttp3.Call localVarCall = shareArrayByInviteValidateBeforeCall(workspace, teamspace, array, emailInvite, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Sends email to multiple recipients with sharing information regarding an array - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param emailInvite list of email recipients (required) * @param _callback The callback to be executed when the API call finishes @@ -1284,15 +1324,16 @@ public ApiResponse shareArrayByInviteWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call shareArrayByInviteAsync(String namespace, String array, InvitationArrayShareEmail emailInvite, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareArrayByInviteAsync(String workspace, String teamspace, String array, InvitationArrayShareEmail emailInvite, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shareArrayByInviteValidateBeforeCall(namespace, array, emailInvite, _callback); + okhttp3.Call localVarCall = shareArrayByInviteValidateBeforeCall(workspace, teamspace, array, emailInvite, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for shareGroupByInvite - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param group name/uri of group that is url-encoded (required) * @param emailInvite list of email/namespace recipients (required) * @param _callback Callback for upload/download progress @@ -1308,7 +1349,7 @@ public okhttp3.Call shareArrayByInviteAsync(String namespace, String array, Invi 0 error response - */ - public okhttp3.Call shareGroupByInviteCall(String namespace, String group, InvitationGroupShareEmail emailInvite, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareGroupByInviteCall(String workspace, String teamspace, String group, InvitationGroupShareEmail emailInvite, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1325,8 +1366,9 @@ public okhttp3.Call shareGroupByInviteCall(String namespace, String group, Invit Object localVarPostBody = emailInvite; // create path and map variables - String localVarPath = "/invitations/group/{namespace}/{group}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/invitations/group/{workspace}/{teamspace}/{group}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "group" + "}", localVarApiClient.escapeString(group.toString())); List localVarQueryParams = new ArrayList(); @@ -1356,10 +1398,15 @@ public okhttp3.Call shareGroupByInviteCall(String namespace, String group, Invit } @SuppressWarnings("rawtypes") - private okhttp3.Call shareGroupByInviteValidateBeforeCall(String namespace, String group, InvitationGroupShareEmail emailInvite, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling shareGroupByInvite(Async)"); + private okhttp3.Call shareGroupByInviteValidateBeforeCall(String workspace, String teamspace, String group, InvitationGroupShareEmail emailInvite, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shareGroupByInvite(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling shareGroupByInvite(Async)"); } // verify the required parameter 'group' is set @@ -1372,14 +1419,15 @@ private okhttp3.Call shareGroupByInviteValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'emailInvite' when calling shareGroupByInvite(Async)"); } - return shareGroupByInviteCall(namespace, group, emailInvite, _callback); + return shareGroupByInviteCall(workspace, teamspace, group, emailInvite, _callback); } /** * * Sends email to multiple recipients with sharing information regarding a group - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param group name/uri of group that is url-encoded (required) * @param emailInvite list of email/namespace recipients (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1393,14 +1441,15 @@ private okhttp3.Call shareGroupByInviteValidateBeforeCall(String namespace, Stri 0 error response - */ - public void shareGroupByInvite(String namespace, String group, InvitationGroupShareEmail emailInvite) throws ApiException { - shareGroupByInviteWithHttpInfo(namespace, group, emailInvite); + public void shareGroupByInvite(String workspace, String teamspace, String group, InvitationGroupShareEmail emailInvite) throws ApiException { + shareGroupByInviteWithHttpInfo(workspace, teamspace, group, emailInvite); } /** * * Sends email to multiple recipients with sharing information regarding a group - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param group name/uri of group that is url-encoded (required) * @param emailInvite list of email/namespace recipients (required) * @return ApiResponse<Void> @@ -1415,15 +1464,16 @@ public void shareGroupByInvite(String namespace, String group, InvitationGroupSh 0 error response - */ - public ApiResponse shareGroupByInviteWithHttpInfo(String namespace, String group, InvitationGroupShareEmail emailInvite) throws ApiException { - okhttp3.Call localVarCall = shareGroupByInviteValidateBeforeCall(namespace, group, emailInvite, null); + public ApiResponse shareGroupByInviteWithHttpInfo(String workspace, String teamspace, String group, InvitationGroupShareEmail emailInvite) throws ApiException { + okhttp3.Call localVarCall = shareGroupByInviteValidateBeforeCall(workspace, teamspace, group, emailInvite, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Sends email to multiple recipients with sharing information regarding a group - * @param namespace namespace group is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param group name/uri of group that is url-encoded (required) * @param emailInvite list of email/namespace recipients (required) * @param _callback The callback to be executed when the API call finishes @@ -1439,15 +1489,16 @@ public ApiResponse shareGroupByInviteWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call shareGroupByInviteAsync(String namespace, String group, InvitationGroupShareEmail emailInvite, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareGroupByInviteAsync(String workspace, String teamspace, String group, InvitationGroupShareEmail emailInvite, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shareGroupByInviteValidateBeforeCall(namespace, group, emailInvite, _callback); + okhttp3.Call localVarCall = shareGroupByInviteValidateBeforeCall(workspace, teamspace, group, emailInvite, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for sharePayment - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param emailInvite Recipients of the invitation. These may only be namespaces, not email addresses. (optional) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1462,7 +1513,7 @@ public okhttp3.Call shareGroupByInviteAsync(String namespace, String group, Invi 0 error response - */ - public okhttp3.Call sharePaymentCall(String namespace, SharePaymentRequest emailInvite, final ApiCallback _callback) throws ApiException { + public okhttp3.Call sharePaymentCall(String workspace, String teamspace, SharePaymentRequest emailInvite, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1479,8 +1530,9 @@ public okhttp3.Call sharePaymentCall(String namespace, SharePaymentRequest email Object localVarPostBody = emailInvite; // create path and map variables - String localVarPath = "/invitations/share_payment/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/invitations/share_payment/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -1509,20 +1561,26 @@ public okhttp3.Call sharePaymentCall(String namespace, SharePaymentRequest email } @SuppressWarnings("rawtypes") - private okhttp3.Call sharePaymentValidateBeforeCall(String namespace, SharePaymentRequest emailInvite, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling sharePayment(Async)"); + private okhttp3.Call sharePaymentValidateBeforeCall(String workspace, String teamspace, SharePaymentRequest emailInvite, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling sharePayment(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling sharePayment(Async)"); } - return sharePaymentCall(namespace, emailInvite, _callback); + return sharePaymentCall(workspace, teamspace, emailInvite, _callback); } /** * * Sends email to multiple recipients allowing them to use the payment instrument provided by the source namespace. - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param emailInvite Recipients of the invitation. These may only be namespaces, not email addresses. (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1535,14 +1593,15 @@ private okhttp3.Call sharePaymentValidateBeforeCall(String namespace, SharePayme 0 error response - */ - public void sharePayment(String namespace, SharePaymentRequest emailInvite) throws ApiException { - sharePaymentWithHttpInfo(namespace, emailInvite); + public void sharePayment(String workspace, String teamspace, SharePaymentRequest emailInvite) throws ApiException { + sharePaymentWithHttpInfo(workspace, teamspace, emailInvite); } /** * * Sends email to multiple recipients allowing them to use the payment instrument provided by the source namespace. - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param emailInvite Recipients of the invitation. These may only be namespaces, not email addresses. (optional) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1556,15 +1615,16 @@ public void sharePayment(String namespace, SharePaymentRequest emailInvite) thro 0 error response - */ - public ApiResponse sharePaymentWithHttpInfo(String namespace, SharePaymentRequest emailInvite) throws ApiException { - okhttp3.Call localVarCall = sharePaymentValidateBeforeCall(namespace, emailInvite, null); + public ApiResponse sharePaymentWithHttpInfo(String workspace, String teamspace, SharePaymentRequest emailInvite) throws ApiException { + okhttp3.Call localVarCall = sharePaymentValidateBeforeCall(workspace, teamspace, emailInvite, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Sends email to multiple recipients allowing them to use the payment instrument provided by the source namespace. - * @param namespace name or UUID of namespace sharing their payment info (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param emailInvite Recipients of the invitation. These may only be namespaces, not email addresses. (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1579,9 +1639,9 @@ public ApiResponse sharePaymentWithHttpInfo(String namespace, SharePayment 0 error response - */ - public okhttp3.Call sharePaymentAsync(String namespace, SharePaymentRequest emailInvite, final ApiCallback _callback) throws ApiException { + public okhttp3.Call sharePaymentAsync(String workspace, String teamspace, SharePaymentRequest emailInvite, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = sharePaymentValidateBeforeCall(namespace, emailInvite, _callback); + okhttp3.Call localVarCall = sharePaymentValidateBeforeCall(workspace, teamspace, emailInvite, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/NotebookApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/NotebookApi.java index 676806c..3e53e7e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/NotebookApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/NotebookApi.java @@ -80,7 +80,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for getNotebookServerStatus - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -94,7 +95,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call getNotebookServerStatusCall(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getNotebookServerStatusCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -111,8 +112,9 @@ public okhttp3.Call getNotebookServerStatusCall(String namespace, final ApiCallb Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/server/{namespace}/status" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/notebooks/server/{workspace}/{teamspace}/status" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -140,20 +142,26 @@ public okhttp3.Call getNotebookServerStatusCall(String namespace, final ApiCallb } @SuppressWarnings("rawtypes") - private okhttp3.Call getNotebookServerStatusValidateBeforeCall(String namespace, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getNotebookServerStatus(Async)"); + private okhttp3.Call getNotebookServerStatusValidateBeforeCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getNotebookServerStatus(Async)"); } - return getNotebookServerStatusCall(namespace, _callback); + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getNotebookServerStatus(Async)"); + } + + return getNotebookServerStatusCall(workspace, teamspace, _callback); } /** * * Get status of the notebook server - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @return NotebookStatus * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -166,15 +174,16 @@ private okhttp3.Call getNotebookServerStatusValidateBeforeCall(String namespace, 0 error response - */ - public NotebookStatus getNotebookServerStatus(String namespace) throws ApiException { - ApiResponse localVarResp = getNotebookServerStatusWithHttpInfo(namespace); + public NotebookStatus getNotebookServerStatus(String workspace, String teamspace) throws ApiException { + ApiResponse localVarResp = getNotebookServerStatusWithHttpInfo(workspace, teamspace); return localVarResp.getData(); } /** * * Get status of the notebook server - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @return ApiResponse<NotebookStatus> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -187,8 +196,8 @@ public NotebookStatus getNotebookServerStatus(String namespace) throws ApiExcept 0 error response - */ - public ApiResponse getNotebookServerStatusWithHttpInfo(String namespace) throws ApiException { - okhttp3.Call localVarCall = getNotebookServerStatusValidateBeforeCall(namespace, null); + public ApiResponse getNotebookServerStatusWithHttpInfo(String workspace, String teamspace) throws ApiException { + okhttp3.Call localVarCall = getNotebookServerStatusValidateBeforeCall(workspace, teamspace, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -196,7 +205,8 @@ public ApiResponse getNotebookServerStatusWithHttpInfo(String na /** * (asynchronously) * Get status of the notebook server - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -210,16 +220,17 @@ public ApiResponse getNotebookServerStatusWithHttpInfo(String na 0 error response - */ - public okhttp3.Call getNotebookServerStatusAsync(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getNotebookServerStatusAsync(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getNotebookServerStatusValidateBeforeCall(namespace, _callback); + okhttp3.Call localVarCall = getNotebookServerStatusValidateBeforeCall(workspace, teamspace, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for handleCopyNotebook - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The name of the notebook (required) * @param notebookCopy Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -235,7 +246,7 @@ public okhttp3.Call getNotebookServerStatusAsync(String namespace, final ApiCall 0 error response - */ - public okhttp3.Call handleCopyNotebookCall(String namespace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleCopyNotebookCall(String workspace, String teamspace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -252,8 +263,9 @@ public okhttp3.Call handleCopyNotebookCall(String namespace, String array, Noteb Object localVarPostBody = notebookCopy; // create path and map variables - String localVarPath = "/notebooks/{namespace}/{array}/copy" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/{workspace}/{teamspace}/{array}/copy" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -291,10 +303,15 @@ public okhttp3.Call handleCopyNotebookCall(String namespace, String array, Noteb } @SuppressWarnings("rawtypes") - private okhttp3.Call handleCopyNotebookValidateBeforeCall(String namespace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling handleCopyNotebook(Async)"); + private okhttp3.Call handleCopyNotebookValidateBeforeCall(String workspace, String teamspace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling handleCopyNotebook(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling handleCopyNotebook(Async)"); } // verify the required parameter 'array' is set @@ -307,14 +324,15 @@ private okhttp3.Call handleCopyNotebookValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'notebookCopy' when calling handleCopyNotebook(Async)"); } - return handleCopyNotebookCall(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); + return handleCopyNotebookCall(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); } /** * * Copy a tiledb notebook at the specified location - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The name of the notebook (required) * @param notebookCopy Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -329,15 +347,16 @@ private okhttp3.Call handleCopyNotebookValidateBeforeCall(String namespace, Stri 0 error response - */ - public NotebookCopied handleCopyNotebook(String namespace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { - ApiResponse localVarResp = handleCopyNotebookWithHttpInfo(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); + public NotebookCopied handleCopyNotebook(String workspace, String teamspace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { + ApiResponse localVarResp = handleCopyNotebookWithHttpInfo(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); return localVarResp.getData(); } /** * * Copy a tiledb notebook at the specified location - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The name of the notebook (required) * @param notebookCopy Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -352,8 +371,8 @@ public NotebookCopied handleCopyNotebook(String namespace, String array, Noteboo 0 error response - */ - public ApiResponse handleCopyNotebookWithHttpInfo(String namespace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { - okhttp3.Call localVarCall = handleCopyNotebookValidateBeforeCall(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, null); + public ApiResponse handleCopyNotebookWithHttpInfo(String workspace, String teamspace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { + okhttp3.Call localVarCall = handleCopyNotebookValidateBeforeCall(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -361,7 +380,8 @@ public ApiResponse handleCopyNotebookWithHttpInfo(String namespa /** * (asynchronously) * Copy a tiledb notebook at the specified location - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array The name of the notebook (required) * @param notebookCopy Input/Output information to create a new TileDB file (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -377,16 +397,17 @@ public ApiResponse handleCopyNotebookWithHttpInfo(String namespa 0 error response - */ - public okhttp3.Call handleCopyNotebookAsync(String namespace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleCopyNotebookAsync(String workspace, String teamspace, String array, NotebookCopy notebookCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = handleCopyNotebookValidateBeforeCall(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); + okhttp3.Call localVarCall = handleCopyNotebookValidateBeforeCall(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for handleUploadNotebook - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the notebook to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -402,7 +423,7 @@ public okhttp3.Call handleCopyNotebookAsync(String namespace, String array, Note 0 error response - */ - public okhttp3.Call handleUploadNotebookCall(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleUploadNotebookCall(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -419,8 +440,9 @@ public okhttp3.Call handleUploadNotebookCall(String namespace, File inputFile, S Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/{namespace}/upload" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/notebooks/{workspace}/{teamspace}/upload" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -465,10 +487,15 @@ public okhttp3.Call handleUploadNotebookCall(String namespace, File inputFile, S } @SuppressWarnings("rawtypes") - private okhttp3.Call handleUploadNotebookValidateBeforeCall(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling handleUploadNotebook(Async)"); + private okhttp3.Call handleUploadNotebookValidateBeforeCall(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling handleUploadNotebook(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling handleUploadNotebook(Async)"); } // verify the required parameter 'inputFile' is set @@ -476,14 +503,15 @@ private okhttp3.Call handleUploadNotebookValidateBeforeCall(String namespace, Fi throw new ApiException("Missing the required parameter 'inputFile' when calling handleUploadNotebook(Async)"); } - return handleUploadNotebookCall(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); + return handleUploadNotebookCall(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); } /** * * Upload a notebook at the specified location - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the notebook to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -498,15 +526,16 @@ private okhttp3.Call handleUploadNotebookValidateBeforeCall(String namespace, Fi 0 error response - */ - public FileUploaded handleUploadNotebook(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { - ApiResponse localVarResp = handleUploadNotebookWithHttpInfo(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); + public FileUploaded handleUploadNotebook(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { + ApiResponse localVarResp = handleUploadNotebookWithHttpInfo(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); return localVarResp.getData(); } /** * * Upload a notebook at the specified location - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the notebook to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -521,8 +550,8 @@ public FileUploaded handleUploadNotebook(String namespace, File inputFile, Strin 0 error response - */ - public ApiResponse handleUploadNotebookWithHttpInfo(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { - okhttp3.Call localVarCall = handleUploadNotebookValidateBeforeCall(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, null); + public ApiResponse handleUploadNotebookWithHttpInfo(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name) throws ApiException { + okhttp3.Call localVarCall = handleUploadNotebookValidateBeforeCall(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -530,7 +559,8 @@ public ApiResponse handleUploadNotebookWithHttpInfo(String namespa /** * (asynchronously) * Upload a notebook at the specified location - * @param namespace The namespace of the notebook (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param inputFile the notebook to upload (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) * @param outputUri output location of the TileDB File (optional) @@ -546,16 +576,17 @@ public ApiResponse handleUploadNotebookWithHttpInfo(String namespa 0 error response - */ - public okhttp3.Call handleUploadNotebookAsync(String namespace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleUploadNotebookAsync(String workspace, String teamspace, File inputFile, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, String outputUri, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = handleUploadNotebookValidateBeforeCall(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); + okhttp3.Call localVarCall = handleUploadNotebookValidateBeforeCall(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for shutdownNotebookServer - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -568,7 +599,7 @@ public okhttp3.Call handleUploadNotebookAsync(String namespace, File inputFile, 0 error response - */ - public okhttp3.Call shutdownNotebookServerCall(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shutdownNotebookServerCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -585,8 +616,9 @@ public okhttp3.Call shutdownNotebookServerCall(String namespace, final ApiCallba Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/server/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/notebooks/server/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -614,20 +646,26 @@ public okhttp3.Call shutdownNotebookServerCall(String namespace, final ApiCallba } @SuppressWarnings("rawtypes") - private okhttp3.Call shutdownNotebookServerValidateBeforeCall(String namespace, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling shutdownNotebookServer(Async)"); + private okhttp3.Call shutdownNotebookServerValidateBeforeCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shutdownNotebookServer(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling shutdownNotebookServer(Async)"); } - return shutdownNotebookServerCall(namespace, _callback); + return shutdownNotebookServerCall(workspace, teamspace, _callback); } /** * * Shutdown a notebook server - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -638,14 +676,15 @@ private okhttp3.Call shutdownNotebookServerValidateBeforeCall(String namespace,
0 error response -
*/ - public void shutdownNotebookServer(String namespace) throws ApiException { - shutdownNotebookServerWithHttpInfo(namespace); + public void shutdownNotebookServer(String workspace, String teamspace) throws ApiException { + shutdownNotebookServerWithHttpInfo(workspace, teamspace); } /** * * Shutdown a notebook server - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -657,15 +696,16 @@ public void shutdownNotebookServer(String namespace) throws ApiException { 0 error response - */ - public ApiResponse shutdownNotebookServerWithHttpInfo(String namespace) throws ApiException { - okhttp3.Call localVarCall = shutdownNotebookServerValidateBeforeCall(namespace, null); + public ApiResponse shutdownNotebookServerWithHttpInfo(String workspace, String teamspace) throws ApiException { + okhttp3.Call localVarCall = shutdownNotebookServerValidateBeforeCall(workspace, teamspace, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Shutdown a notebook server - * @param namespace namespace notebook is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -678,15 +718,16 @@ public ApiResponse shutdownNotebookServerWithHttpInfo(String namespace) th 0 error response - */ - public okhttp3.Call shutdownNotebookServerAsync(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shutdownNotebookServerAsync(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shutdownNotebookServerValidateBeforeCall(namespace, _callback); + okhttp3.Call localVarCall = shutdownNotebookServerValidateBeforeCall(workspace, teamspace, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for updateNotebookName - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of notebook (array) that is url-encoded (required) * @param notebookMetadata notebook (array) metadata to update (required) * @param _callback Callback for upload/download progress @@ -700,7 +741,7 @@ public okhttp3.Call shutdownNotebookServerAsync(String namespace, final ApiCallb 0 error response - */ - public okhttp3.Call updateNotebookNameCall(String namespace, String array, ArrayInfoUpdate notebookMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateNotebookNameCall(String workspace, String teamspace, String array, ArrayInfoUpdate notebookMetadata, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -717,8 +758,9 @@ public okhttp3.Call updateNotebookNameCall(String namespace, String array, Array Object localVarPostBody = notebookMetadata; // create path and map variables - String localVarPath = "/notebooks/{namespace}/{array}/rename" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/{workspace}/{teamspace}/{array}/rename" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -748,10 +790,15 @@ public okhttp3.Call updateNotebookNameCall(String namespace, String array, Array } @SuppressWarnings("rawtypes") - private okhttp3.Call updateNotebookNameValidateBeforeCall(String namespace, String array, ArrayInfoUpdate notebookMetadata, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateNotebookName(Async)"); + private okhttp3.Call updateNotebookNameValidateBeforeCall(String workspace, String teamspace, String array, ArrayInfoUpdate notebookMetadata, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateNotebookName(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling updateNotebookName(Async)"); } // verify the required parameter 'array' is set @@ -764,14 +811,15 @@ private okhttp3.Call updateNotebookNameValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'notebookMetadata' when calling updateNotebookName(Async)"); } - return updateNotebookNameCall(namespace, array, notebookMetadata, _callback); + return updateNotebookNameCall(workspace, teamspace, array, notebookMetadata, _callback); } /** * * update name on a notebok, moving related S3 object to new location - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of notebook (array) that is url-encoded (required) * @param notebookMetadata notebook (array) metadata to update (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -783,14 +831,15 @@ private okhttp3.Call updateNotebookNameValidateBeforeCall(String namespace, Stri 0 error response - */ - public void updateNotebookName(String namespace, String array, ArrayInfoUpdate notebookMetadata) throws ApiException { - updateNotebookNameWithHttpInfo(namespace, array, notebookMetadata); + public void updateNotebookName(String workspace, String teamspace, String array, ArrayInfoUpdate notebookMetadata) throws ApiException { + updateNotebookNameWithHttpInfo(workspace, teamspace, array, notebookMetadata); } /** * * update name on a notebok, moving related S3 object to new location - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of notebook (array) that is url-encoded (required) * @param notebookMetadata notebook (array) metadata to update (required) * @return ApiResponse<Void> @@ -803,15 +852,16 @@ public void updateNotebookName(String namespace, String array, ArrayInfoUpdate n 0 error response - */ - public ApiResponse updateNotebookNameWithHttpInfo(String namespace, String array, ArrayInfoUpdate notebookMetadata) throws ApiException { - okhttp3.Call localVarCall = updateNotebookNameValidateBeforeCall(namespace, array, notebookMetadata, null); + public ApiResponse updateNotebookNameWithHttpInfo(String workspace, String teamspace, String array, ArrayInfoUpdate notebookMetadata) throws ApiException { + okhttp3.Call localVarCall = updateNotebookNameValidateBeforeCall(workspace, teamspace, array, notebookMetadata, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * update name on a notebok, moving related S3 object to new location - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of notebook (array) that is url-encoded (required) * @param notebookMetadata notebook (array) metadata to update (required) * @param _callback The callback to be executed when the API call finishes @@ -825,9 +875,9 @@ public ApiResponse updateNotebookNameWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call updateNotebookNameAsync(String namespace, String array, ArrayInfoUpdate notebookMetadata, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateNotebookNameAsync(String workspace, String teamspace, String array, ArrayInfoUpdate notebookMetadata, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateNotebookNameValidateBeforeCall(namespace, array, notebookMetadata, _callback); + okhttp3.Call localVarCall = updateNotebookNameValidateBeforeCall(workspace, teamspace, array, notebookMetadata, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/NotebooksApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/NotebooksApi.java index e32dc2f..aa02a36 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/NotebooksApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/NotebooksApi.java @@ -74,8 +74,9 @@ public void setCustomBaseUrl(String customBaseUrl) { } /** - * Build call for notebooksNamespaceArrayEndTimestampsGet - * @param namespace namespace array is in (an organization name or user's username) (required) + * Build call for notebooksWorkspaceTeamspaceArrayEndTimestampsGet + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -90,7 +91,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call notebooksNamespaceArrayEndTimestampsGetCall(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call notebooksWorkspaceTeamspaceArrayEndTimestampsGetCall(String workspace, String teamspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -107,8 +108,9 @@ public okhttp3.Call notebooksNamespaceArrayEndTimestampsGetCall(String namespace Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/{namespace}/{array}/end_timestamps" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/{workspace}/{teamspace}/{array}/end_timestamps" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -145,25 +147,31 @@ public okhttp3.Call notebooksNamespaceArrayEndTimestampsGetCall(String namespace } @SuppressWarnings("rawtypes") - private okhttp3.Call notebooksNamespaceArrayEndTimestampsGetValidateBeforeCall(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling notebooksNamespaceArrayEndTimestampsGet(Async)"); + private okhttp3.Call notebooksWorkspaceTeamspaceArrayEndTimestampsGetValidateBeforeCall(String workspace, String teamspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling notebooksWorkspaceTeamspaceArrayEndTimestampsGet(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling notebooksWorkspaceTeamspaceArrayEndTimestampsGet(Async)"); } // verify the required parameter 'array' is set if (array == null) { - throw new ApiException("Missing the required parameter 'array' when calling notebooksNamespaceArrayEndTimestampsGet(Async)"); + throw new ApiException("Missing the required parameter 'array' when calling notebooksWorkspaceTeamspaceArrayEndTimestampsGet(Async)"); } - return notebooksNamespaceArrayEndTimestampsGetCall(namespace, array, page, perPage, _callback); + return notebooksWorkspaceTeamspaceArrayEndTimestampsGetCall(workspace, teamspace, array, page, perPage, _callback); } /** * * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -177,15 +185,16 @@ private okhttp3.Call notebooksNamespaceArrayEndTimestampsGetValidateBeforeCall(S 0 error response - */ - public ArrayEndTimestampData notebooksNamespaceArrayEndTimestampsGet(String namespace, String array, Integer page, Integer perPage) throws ApiException { - ApiResponse localVarResp = notebooksNamespaceArrayEndTimestampsGetWithHttpInfo(namespace, array, page, perPage); + public ArrayEndTimestampData notebooksWorkspaceTeamspaceArrayEndTimestampsGet(String workspace, String teamspace, String array, Integer page, Integer perPage) throws ApiException { + ApiResponse localVarResp = notebooksWorkspaceTeamspaceArrayEndTimestampsGetWithHttpInfo(workspace, teamspace, array, page, perPage); return localVarResp.getData(); } /** * * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -199,8 +208,8 @@ public ArrayEndTimestampData notebooksNamespaceArrayEndTimestampsGet(String name 0 error response - */ - public ApiResponse notebooksNamespaceArrayEndTimestampsGetWithHttpInfo(String namespace, String array, Integer page, Integer perPage) throws ApiException { - okhttp3.Call localVarCall = notebooksNamespaceArrayEndTimestampsGetValidateBeforeCall(namespace, array, page, perPage, null); + public ApiResponse notebooksWorkspaceTeamspaceArrayEndTimestampsGetWithHttpInfo(String workspace, String teamspace, String array, Integer page, Integer perPage) throws ApiException { + okhttp3.Call localVarCall = notebooksWorkspaceTeamspaceArrayEndTimestampsGetValidateBeforeCall(workspace, teamspace, array, page, perPage, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -208,7 +217,8 @@ public ApiResponse notebooksNamespaceArrayEndTimestampsGe /** * (asynchronously) * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -223,16 +233,17 @@ public ApiResponse notebooksNamespaceArrayEndTimestampsGe 0 error response - */ - public okhttp3.Call notebooksNamespaceArrayEndTimestampsGetAsync(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call notebooksWorkspaceTeamspaceArrayEndTimestampsGetAsync(String workspace, String teamspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = notebooksNamespaceArrayEndTimestampsGetValidateBeforeCall(namespace, array, page, perPage, _callback); + okhttp3.Call localVarCall = notebooksWorkspaceTeamspaceArrayEndTimestampsGetValidateBeforeCall(workspace, teamspace, array, page, perPage, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** - * Build call for notebooksNamespaceArrayPrunePost - * @param namespace namespace array is in (an organization name or user's username) (required) + * Build call for notebooksWorkspaceTeamspaceArrayPrunePost + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param keepVersions The number of most recents fragment to preserve (optional) * @param _callback Callback for upload/download progress @@ -246,7 +257,7 @@ public okhttp3.Call notebooksNamespaceArrayEndTimestampsGetAsync(String namespac 0 error response - */ - public okhttp3.Call notebooksNamespaceArrayPrunePostCall(String namespace, String array, Integer keepVersions, final ApiCallback _callback) throws ApiException { + public okhttp3.Call notebooksWorkspaceTeamspaceArrayPrunePostCall(String workspace, String teamspace, String array, Integer keepVersions, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -263,8 +274,9 @@ public okhttp3.Call notebooksNamespaceArrayPrunePostCall(String namespace, Strin Object localVarPostBody = null; // create path and map variables - String localVarPath = "/notebooks/{namespace}/{array}/prune" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/notebooks/{workspace}/{teamspace}/{array}/prune" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -297,25 +309,31 @@ public okhttp3.Call notebooksNamespaceArrayPrunePostCall(String namespace, Strin } @SuppressWarnings("rawtypes") - private okhttp3.Call notebooksNamespaceArrayPrunePostValidateBeforeCall(String namespace, String array, Integer keepVersions, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling notebooksNamespaceArrayPrunePost(Async)"); + private okhttp3.Call notebooksWorkspaceTeamspaceArrayPrunePostValidateBeforeCall(String workspace, String teamspace, String array, Integer keepVersions, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling notebooksWorkspaceTeamspaceArrayPrunePost(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling notebooksWorkspaceTeamspaceArrayPrunePost(Async)"); } // verify the required parameter 'array' is set if (array == null) { - throw new ApiException("Missing the required parameter 'array' when calling notebooksNamespaceArrayPrunePost(Async)"); + throw new ApiException("Missing the required parameter 'array' when calling notebooksWorkspaceTeamspaceArrayPrunePost(Async)"); } - return notebooksNamespaceArrayPrunePostCall(namespace, array, keepVersions, _callback); + return notebooksWorkspaceTeamspaceArrayPrunePostCall(workspace, teamspace, array, keepVersions, _callback); } /** * * prune fragments of the notebook - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param keepVersions The number of most recents fragment to preserve (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -327,14 +345,15 @@ private okhttp3.Call notebooksNamespaceArrayPrunePostValidateBeforeCall(String n 0 error response - */ - public void notebooksNamespaceArrayPrunePost(String namespace, String array, Integer keepVersions) throws ApiException { - notebooksNamespaceArrayPrunePostWithHttpInfo(namespace, array, keepVersions); + public void notebooksWorkspaceTeamspaceArrayPrunePost(String workspace, String teamspace, String array, Integer keepVersions) throws ApiException { + notebooksWorkspaceTeamspaceArrayPrunePostWithHttpInfo(workspace, teamspace, array, keepVersions); } /** * * prune fragments of the notebook - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param keepVersions The number of most recents fragment to preserve (optional) * @return ApiResponse<Void> @@ -347,15 +366,16 @@ public void notebooksNamespaceArrayPrunePost(String namespace, String array, Int 0 error response - */ - public ApiResponse notebooksNamespaceArrayPrunePostWithHttpInfo(String namespace, String array, Integer keepVersions) throws ApiException { - okhttp3.Call localVarCall = notebooksNamespaceArrayPrunePostValidateBeforeCall(namespace, array, keepVersions, null); + public ApiResponse notebooksWorkspaceTeamspaceArrayPrunePostWithHttpInfo(String workspace, String teamspace, String array, Integer keepVersions) throws ApiException { + okhttp3.Call localVarCall = notebooksWorkspaceTeamspaceArrayPrunePostValidateBeforeCall(workspace, teamspace, array, keepVersions, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * prune fragments of the notebook - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param keepVersions The number of most recents fragment to preserve (optional) * @param _callback The callback to be executed when the API call finishes @@ -369,9 +389,9 @@ public ApiResponse notebooksNamespaceArrayPrunePostWithHttpInfo(String nam 0 error response - */ - public okhttp3.Call notebooksNamespaceArrayPrunePostAsync(String namespace, String array, Integer keepVersions, final ApiCallback _callback) throws ApiException { + public okhttp3.Call notebooksWorkspaceTeamspaceArrayPrunePostAsync(String workspace, String teamspace, String array, Integer keepVersions, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = notebooksNamespaceArrayPrunePostValidateBeforeCall(namespace, array, keepVersions, _callback); + okhttp3.Call localVarCall = notebooksWorkspaceTeamspaceArrayPrunePostValidateBeforeCall(workspace, teamspace, array, keepVersions, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/OrganizationApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/OrganizationApi.java index 75fc700..c995930 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/OrganizationApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/OrganizationApi.java @@ -81,7 +81,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for addAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -94,7 +95,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call addAWSAccessCredentialsCall(String namespace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addAWSAccessCredentialsCall(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -111,8 +112,9 @@ public okhttp3.Call addAWSAccessCredentialsCall(String namespace, AWSAccessCrede Object localVarPostBody = awsAccessCredentials; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/credentials/{workspace}/{teamspace}/aws" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -141,10 +143,15 @@ public okhttp3.Call addAWSAccessCredentialsCall(String namespace, AWSAccessCrede } @SuppressWarnings("rawtypes") - private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String namespace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling addAWSAccessCredentials(Async)"); + private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling addAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling addAWSAccessCredentials(Async)"); } // verify the required parameter 'awsAccessCredentials' is set @@ -152,14 +159,15 @@ private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'awsAccessCredentials' when calling addAWSAccessCredentials(Async)"); } - return addAWSAccessCredentialsCall(namespace, awsAccessCredentials, _callback); + return addAWSAccessCredentialsCall(workspace, teamspace, awsAccessCredentials, _callback); } /** * * Add aws keys - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -170,14 +178,15 @@ private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String namespace, 0 error response - */ - public void addAWSAccessCredentials(String namespace, AWSAccessCredentials awsAccessCredentials) throws ApiException { - addAWSAccessCredentialsWithHttpInfo(namespace, awsAccessCredentials); + public void addAWSAccessCredentials(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials) throws ApiException { + addAWSAccessCredentialsWithHttpInfo(workspace, teamspace, awsAccessCredentials); } /** * * Add aws keys - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -189,15 +198,16 @@ public void addAWSAccessCredentials(String namespace, AWSAccessCredentials awsAc 0 error response - */ - public ApiResponse addAWSAccessCredentialsWithHttpInfo(String namespace, AWSAccessCredentials awsAccessCredentials) throws ApiException { - okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(namespace, awsAccessCredentials, null); + public ApiResponse addAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials) throws ApiException { + okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, awsAccessCredentials, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Add aws keys - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -210,9 +220,9 @@ public ApiResponse addAWSAccessCredentialsWithHttpInfo(String namespace, A 0 error response - */ - public okhttp3.Call addAWSAccessCredentialsAsync(String namespace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addAWSAccessCredentialsAsync(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(namespace, awsAccessCredentials, _callback); + okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, awsAccessCredentials, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } @@ -355,7 +365,8 @@ public okhttp3.Call addUserToOrganizationAsync(String organization, Organization } /** * Build call for checkAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -367,7 +378,7 @@ public okhttp3.Call addUserToOrganizationAsync(String organization, Organization 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsCall(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -384,8 +395,9 @@ public okhttp3.Call checkAWSAccessCredentialsCall(String namespace, final ApiCal Object localVarPostBody = null; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/credentials/{workspace}/{teamspace}/aws" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -413,20 +425,26 @@ public okhttp3.Call checkAWSAccessCredentialsCall(String namespace, final ApiCal } @SuppressWarnings("rawtypes") - private okhttp3.Call checkAWSAccessCredentialsValidateBeforeCall(String namespace, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling checkAWSAccessCredentials(Async)"); + private okhttp3.Call checkAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling checkAWSAccessCredentials(Async)"); } - return checkAWSAccessCredentialsCall(namespace, _callback); + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling checkAWSAccessCredentials(Async)"); + } + + return checkAWSAccessCredentialsCall(workspace, teamspace, _callback); } /** * * Check if aws keys are set - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @return List<AWSAccessCredentials> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -437,15 +455,16 @@ private okhttp3.Call checkAWSAccessCredentialsValidateBeforeCall(String namespac 0 error response - */ - public List checkAWSAccessCredentials(String namespace) throws ApiException { - ApiResponse> localVarResp = checkAWSAccessCredentialsWithHttpInfo(namespace); + public List checkAWSAccessCredentials(String workspace, String teamspace) throws ApiException { + ApiResponse> localVarResp = checkAWSAccessCredentialsWithHttpInfo(workspace, teamspace); return localVarResp.getData(); } /** * * Check if aws keys are set - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @return ApiResponse<List<AWSAccessCredentials>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -456,8 +475,8 @@ public List checkAWSAccessCredentials(String namespace) th 0 error response - */ - public ApiResponse> checkAWSAccessCredentialsWithHttpInfo(String namespace) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(namespace, null); + public ApiResponse> checkAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace) throws ApiException { + okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -465,7 +484,8 @@ public ApiResponse> checkAWSAccessCredentialsWithHttp /** * (asynchronously) * Check if aws keys are set - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -477,16 +497,17 @@ public ApiResponse> checkAWSAccessCredentialsWithHttp 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsAsync(String namespace, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsAsync(String workspace, String teamspace, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(namespace, _callback); + okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for checkAWSAccessCredentialsByName - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -499,7 +520,7 @@ public okhttp3.Call checkAWSAccessCredentialsAsync(String namespace, final ApiCa 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsByNameCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsByNameCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -516,8 +537,9 @@ public okhttp3.Call checkAWSAccessCredentialsByNameCall(String namespace, String Object localVarPostBody = null; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/credentials/{workspace}/{teamspace}/aws/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -546,10 +568,15 @@ public okhttp3.Call checkAWSAccessCredentialsByNameCall(String namespace, String } @SuppressWarnings("rawtypes") - private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling checkAWSAccessCredentialsByName(Async)"); + private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling checkAWSAccessCredentialsByName(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling checkAWSAccessCredentialsByName(Async)"); } // verify the required parameter 'name' is set @@ -557,14 +584,15 @@ private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String na throw new ApiException("Missing the required parameter 'name' when calling checkAWSAccessCredentialsByName(Async)"); } - return checkAWSAccessCredentialsByNameCall(namespace, name, _callback); + return checkAWSAccessCredentialsByNameCall(workspace, teamspace, name, _callback); } /** * * Check if aws keys are set by name - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @return AWSAccessCredentials * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -576,15 +604,16 @@ private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String na 0 error response - */ - public AWSAccessCredentials checkAWSAccessCredentialsByName(String namespace, String name) throws ApiException { - ApiResponse localVarResp = checkAWSAccessCredentialsByNameWithHttpInfo(namespace, name); + public AWSAccessCredentials checkAWSAccessCredentialsByName(String workspace, String teamspace, String name) throws ApiException { + ApiResponse localVarResp = checkAWSAccessCredentialsByNameWithHttpInfo(workspace, teamspace, name); return localVarResp.getData(); } /** * * Check if aws keys are set by name - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @return ApiResponse<AWSAccessCredentials> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -596,8 +625,8 @@ public AWSAccessCredentials checkAWSAccessCredentialsByName(String namespace, St 0 error response - */ - public ApiResponse checkAWSAccessCredentialsByNameWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(namespace, name, null); + public ApiResponse checkAWSAccessCredentialsByNameWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(workspace, teamspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -605,7 +634,8 @@ public ApiResponse checkAWSAccessCredentialsByNameWithHttp /** * (asynchronously) * Check if aws keys are set by name - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -618,9 +648,9 @@ public ApiResponse checkAWSAccessCredentialsByNameWithHttp 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsByNameAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsByNameAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(workspace, teamspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -1028,7 +1058,8 @@ public okhttp3.Call createSSODomainAsync(String organization, SSODomainConfig co } /** * Build call for deleteAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -1041,7 +1072,7 @@ public okhttp3.Call createSSODomainAsync(String organization, SSODomainConfig co 0 error response - */ - public okhttp3.Call deleteAWSAccessCredentialsCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteAWSAccessCredentialsCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1058,8 +1089,9 @@ public okhttp3.Call deleteAWSAccessCredentialsCall(String namespace, String name Object localVarPostBody = null; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/credentials/{workspace}/{teamspace}/aws/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1088,10 +1120,15 @@ public okhttp3.Call deleteAWSAccessCredentialsCall(String namespace, String name } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteAWSAccessCredentials(Async)"); + private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteAWSAccessCredentials(Async)"); } // verify the required parameter 'name' is set @@ -1099,14 +1136,15 @@ private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String namespa throw new ApiException("Missing the required parameter 'name' when calling deleteAWSAccessCredentials(Async)"); } - return deleteAWSAccessCredentialsCall(namespace, name, _callback); + return deleteAWSAccessCredentialsCall(workspace, teamspace, name, _callback); } /** * * delete a AWS Access credentials in a namespace. This will likely cause arrays to become unreachable - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1117,14 +1155,15 @@ private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String namespa 0 error response - */ - public void deleteAWSAccessCredentials(String namespace, String name) throws ApiException { - deleteAWSAccessCredentialsWithHttpInfo(namespace, name); + public void deleteAWSAccessCredentials(String workspace, String teamspace, String name) throws ApiException { + deleteAWSAccessCredentialsWithHttpInfo(workspace, teamspace, name); } /** * * delete a AWS Access credentials in a namespace. This will likely cause arrays to become unreachable - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1136,15 +1175,16 @@ public void deleteAWSAccessCredentials(String namespace, String name) throws Api 0 error response - */ - public ApiResponse deleteAWSAccessCredentialsWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(namespace, name, null); + public ApiResponse deleteAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * delete a AWS Access credentials in a namespace. This will likely cause arrays to become unreachable - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1157,9 +1197,9 @@ public ApiResponse deleteAWSAccessCredentialsWithHttpInfo(String namespace 0 error response - */ - public okhttp3.Call deleteAWSAccessCredentialsAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteAWSAccessCredentialsAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } @@ -2235,7 +2275,8 @@ public okhttp3.Call getSSODomainsAsync(String organization, final ApiCallback 0 error response - */ - public okhttp3.Call updateAWSAccessCredentialsCall(String namespace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateAWSAccessCredentialsCall(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2266,8 +2307,9 @@ public okhttp3.Call updateAWSAccessCredentialsCall(String namespace, String name Object localVarPostBody = awsAccessCredentials; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/credentials/{workspace}/{teamspace}/aws/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -2297,10 +2339,15 @@ public okhttp3.Call updateAWSAccessCredentialsCall(String namespace, String name } @SuppressWarnings("rawtypes") - private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String namespace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateAWSAccessCredentials(Async)"); + private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling updateAWSAccessCredentials(Async)"); } // verify the required parameter 'name' is set @@ -2313,14 +2360,15 @@ private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String namespa throw new ApiException("Missing the required parameter 'awsAccessCredentials' when calling updateAWSAccessCredentials(Async)"); } - return updateAWSAccessCredentialsCall(namespace, name, awsAccessCredentials, _callback); + return updateAWSAccessCredentialsCall(workspace, teamspace, name, awsAccessCredentials, _callback); } /** * * Update aws keys or associated buckets. This will update the key associations for each array in the namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -2332,14 +2380,15 @@ private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String namespa 0 error response - */ - public void updateAWSAccessCredentials(String namespace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { - updateAWSAccessCredentialsWithHttpInfo(namespace, name, awsAccessCredentials); + public void updateAWSAccessCredentials(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { + updateAWSAccessCredentialsWithHttpInfo(workspace, teamspace, name, awsAccessCredentials); } /** * * Update aws keys or associated buckets. This will update the key associations for each array in the namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @return ApiResponse<Void> @@ -2352,15 +2401,16 @@ public void updateAWSAccessCredentials(String namespace, String name, AWSAccessC 0 error response - */ - public ApiResponse updateAWSAccessCredentialsWithHttpInfo(String namespace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { - okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(namespace, name, awsAccessCredentials, null); + public ApiResponse updateAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { + okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, awsAccessCredentials, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Update aws keys or associated buckets. This will update the key associations for each array in the namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @param _callback The callback to be executed when the API call finishes @@ -2374,9 +2424,9 @@ public ApiResponse updateAWSAccessCredentialsWithHttpInfo(String namespace 0 error response - */ - public okhttp3.Call updateAWSAccessCredentialsAsync(String namespace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateAWSAccessCredentialsAsync(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(namespace, name, awsAccessCredentials, _callback); + okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, awsAccessCredentials, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/QueryApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/QueryApi.java index fff1ee2..c80420b 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/QueryApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/QueryApi.java @@ -77,7 +77,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for finalizeQuery - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -96,7 +97,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call finalizeQueryCall(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + public okhttp3.Call finalizeQueryCall(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -113,8 +114,9 @@ public okhttp3.Call finalizeQueryCall(String namespace, String array, String typ Object localVarPostBody = query; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/query/finalize" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/query/finalize" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -162,10 +164,15 @@ public okhttp3.Call finalizeQueryCall(String namespace, String array, String typ } @SuppressWarnings("rawtypes") - private okhttp3.Call finalizeQueryValidateBeforeCall(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling finalizeQuery(Async)"); + private okhttp3.Call finalizeQueryValidateBeforeCall(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling finalizeQuery(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling finalizeQuery(Async)"); } // verify the required parameter 'array' is set @@ -188,14 +195,15 @@ private okhttp3.Call finalizeQueryValidateBeforeCall(String namespace, String ar throw new ApiException("Missing the required parameter 'query' when calling finalizeQuery(Async)"); } - return finalizeQueryCall(namespace, array, type, contentType, query, xPayer, openAt, _callback); + return finalizeQueryCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, _callback); } /** * * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -213,15 +221,16 @@ private okhttp3.Call finalizeQueryValidateBeforeCall(String namespace, String ar 0 error response - */ - public Query finalizeQuery(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { - ApiResponse localVarResp = finalizeQueryWithHttpInfo(namespace, array, type, contentType, query, xPayer, openAt); + public Query finalizeQuery(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { + ApiResponse localVarResp = finalizeQueryWithHttpInfo(workspace, teamspace, array, type, contentType, query, xPayer, openAt); return localVarResp.getData(); } /** * * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -239,8 +248,8 @@ public Query finalizeQuery(String namespace, String array, String type, String c 0 error response - */ - public ApiResponse finalizeQueryWithHttpInfo(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { - okhttp3.Call localVarCall = finalizeQueryValidateBeforeCall(namespace, array, type, contentType, query, xPayer, openAt, null); + public ApiResponse finalizeQueryWithHttpInfo(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { + okhttp3.Call localVarCall = finalizeQueryValidateBeforeCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -248,7 +257,8 @@ public ApiResponse finalizeQueryWithHttpInfo(String namespace, String arr /** * (asynchronously) * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -267,16 +277,17 @@ public ApiResponse finalizeQueryWithHttpInfo(String namespace, String arr 0 error response - */ - public okhttp3.Call finalizeQueryAsync(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + public okhttp3.Call finalizeQueryAsync(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = finalizeQueryValidateBeforeCall(namespace, array, type, contentType, query, xPayer, openAt, _callback); + okhttp3.Call localVarCall = finalizeQueryValidateBeforeCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getEstResultSizes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -295,7 +306,7 @@ public okhttp3.Call finalizeQueryAsync(String namespace, String array, String ty 0 error response - */ - public okhttp3.Call getEstResultSizesCall(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getEstResultSizesCall(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -312,8 +323,9 @@ public okhttp3.Call getEstResultSizesCall(String namespace, String array, String Object localVarPostBody = query; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/query/est_result_sizes" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/query/est_result_sizes" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -361,10 +373,15 @@ public okhttp3.Call getEstResultSizesCall(String namespace, String array, String } @SuppressWarnings("rawtypes") - private okhttp3.Call getEstResultSizesValidateBeforeCall(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getEstResultSizes(Async)"); + private okhttp3.Call getEstResultSizesValidateBeforeCall(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getEstResultSizes(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getEstResultSizes(Async)"); } // verify the required parameter 'array' is set @@ -387,14 +404,15 @@ private okhttp3.Call getEstResultSizesValidateBeforeCall(String namespace, Strin throw new ApiException("Missing the required parameter 'query' when calling getEstResultSizes(Async)"); } - return getEstResultSizesCall(namespace, array, type, contentType, query, xPayer, openAt, _callback); + return getEstResultSizesCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, _callback); } /** * * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -412,15 +430,16 @@ private okhttp3.Call getEstResultSizesValidateBeforeCall(String namespace, Strin 0 error response - */ - public Query getEstResultSizes(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { - ApiResponse localVarResp = getEstResultSizesWithHttpInfo(namespace, array, type, contentType, query, xPayer, openAt); + public Query getEstResultSizes(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { + ApiResponse localVarResp = getEstResultSizesWithHttpInfo(workspace, teamspace, array, type, contentType, query, xPayer, openAt); return localVarResp.getData(); } /** * * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -438,8 +457,8 @@ public Query getEstResultSizes(String namespace, String array, String type, Stri 0 error response - */ - public ApiResponse getEstResultSizesWithHttpInfo(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { - okhttp3.Call localVarCall = getEstResultSizesValidateBeforeCall(namespace, array, type, contentType, query, xPayer, openAt, null); + public ApiResponse getEstResultSizesWithHttpInfo(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { + okhttp3.Call localVarCall = getEstResultSizesValidateBeforeCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -447,7 +466,8 @@ public ApiResponse getEstResultSizesWithHttpInfo(String namespace, String /** * (asynchronously) * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -466,16 +486,17 @@ public ApiResponse getEstResultSizesWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call getEstResultSizesAsync(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getEstResultSizesAsync(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getEstResultSizesValidateBeforeCall(namespace, array, type, contentType, query, xPayer, openAt, _callback); + okhttp3.Call localVarCall = getEstResultSizesValidateBeforeCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getFile - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -490,7 +511,7 @@ public okhttp3.Call getEstResultSizesAsync(String namespace, String array, Strin 0 error response - */ - public okhttp3.Call getFileCall(String namespace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getFileCall(String workspace, String teamspace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -507,8 +528,9 @@ public okhttp3.Call getFileCall(String namespace, String array, String contentTy Object localVarPostBody = null; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/query/get_file" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/query/get_file" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -545,10 +567,15 @@ public okhttp3.Call getFileCall(String namespace, String array, String contentTy } @SuppressWarnings("rawtypes") - private okhttp3.Call getFileValidateBeforeCall(String namespace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getFile(Async)"); + private okhttp3.Call getFileValidateBeforeCall(String workspace, String teamspace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getFile(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling getFile(Async)"); } // verify the required parameter 'array' is set @@ -561,14 +588,15 @@ private okhttp3.Call getFileValidateBeforeCall(String namespace, String array, S throw new ApiException("Missing the required parameter 'contentType' when calling getFile(Async)"); } - return getFileCall(namespace, array, contentType, xPayer, _callback); + return getFileCall(workspace, teamspace, array, contentType, xPayer, _callback); } /** * * send a query to run against a specified array/URI registered to a group/project, returns file bytes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -582,15 +610,16 @@ private okhttp3.Call getFileValidateBeforeCall(String namespace, String array, S 0 error response - */ - public File getFile(String namespace, String array, String contentType, String xPayer) throws ApiException { - ApiResponse localVarResp = getFileWithHttpInfo(namespace, array, contentType, xPayer); + public File getFile(String workspace, String teamspace, String array, String contentType, String xPayer) throws ApiException { + ApiResponse localVarResp = getFileWithHttpInfo(workspace, teamspace, array, contentType, xPayer); return localVarResp.getData(); } /** * * send a query to run against a specified array/URI registered to a group/project, returns file bytes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -604,8 +633,8 @@ public File getFile(String namespace, String array, String contentType, String x 0 error response - */ - public ApiResponse getFileWithHttpInfo(String namespace, String array, String contentType, String xPayer) throws ApiException { - okhttp3.Call localVarCall = getFileValidateBeforeCall(namespace, array, contentType, xPayer, null); + public ApiResponse getFileWithHttpInfo(String workspace, String teamspace, String array, String contentType, String xPayer) throws ApiException { + okhttp3.Call localVarCall = getFileValidateBeforeCall(workspace, teamspace, array, contentType, xPayer, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -613,7 +642,8 @@ public ApiResponse getFileWithHttpInfo(String namespace, String array, Str /** * (asynchronously) * send a query to run against a specified array/URI registered to a group/project, returns file bytes - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -628,16 +658,17 @@ public ApiResponse getFileWithHttpInfo(String namespace, String array, Str 0 error response - */ - public okhttp3.Call getFileAsync(String namespace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getFileAsync(String workspace, String teamspace, String array, String contentType, String xPayer, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getFileValidateBeforeCall(namespace, array, contentType, xPayer, _callback); + okhttp3.Call localVarCall = getFileValidateBeforeCall(workspace, teamspace, array, contentType, xPayer, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for submitQuery - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -656,7 +687,7 @@ public okhttp3.Call getFileAsync(String namespace, String array, String contentT 0 error response - */ - public okhttp3.Call submitQueryCall(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitQueryCall(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -673,8 +704,9 @@ public okhttp3.Call submitQueryCall(String namespace, String array, String type, Object localVarPostBody = query; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/query/submit" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/query/submit" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -722,10 +754,15 @@ public okhttp3.Call submitQueryCall(String namespace, String array, String type, } @SuppressWarnings("rawtypes") - private okhttp3.Call submitQueryValidateBeforeCall(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitQuery(Async)"); + private okhttp3.Call submitQueryValidateBeforeCall(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitQuery(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling submitQuery(Async)"); } // verify the required parameter 'array' is set @@ -748,14 +785,15 @@ private okhttp3.Call submitQueryValidateBeforeCall(String namespace, String arra throw new ApiException("Missing the required parameter 'query' when calling submitQuery(Async)"); } - return submitQueryCall(namespace, array, type, contentType, query, xPayer, openAt, _callback); + return submitQueryCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, _callback); } /** * * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -773,15 +811,16 @@ private okhttp3.Call submitQueryValidateBeforeCall(String namespace, String arra 0 error response - */ - public Query submitQuery(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { - ApiResponse localVarResp = submitQueryWithHttpInfo(namespace, array, type, contentType, query, xPayer, openAt); + public Query submitQuery(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { + ApiResponse localVarResp = submitQueryWithHttpInfo(workspace, teamspace, array, type, contentType, query, xPayer, openAt); return localVarResp.getData(); } /** * * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -799,8 +838,8 @@ public Query submitQuery(String namespace, String array, String type, String con 0 error response - */ - public ApiResponse submitQueryWithHttpInfo(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { - okhttp3.Call localVarCall = submitQueryValidateBeforeCall(namespace, array, type, contentType, query, xPayer, openAt, null); + public ApiResponse submitQueryWithHttpInfo(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt) throws ApiException { + okhttp3.Call localVarCall = submitQueryValidateBeforeCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -808,7 +847,8 @@ public ApiResponse submitQueryWithHttpInfo(String namespace, String array /** * (asynchronously) * send a query to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param type type of query (required) * @param contentType Content Type of input and return mime (required) @@ -827,16 +867,17 @@ public ApiResponse submitQueryWithHttpInfo(String namespace, String array 0 error response - */ - public okhttp3.Call submitQueryAsync(String namespace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitQueryAsync(String workspace, String teamspace, String array, String type, String contentType, Query query, String xPayer, Integer openAt, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitQueryValidateBeforeCall(namespace, array, type, contentType, query, xPayer, openAt, _callback); + okhttp3.Call localVarCall = submitQueryValidateBeforeCall(workspace, teamspace, array, type, contentType, query, xPayer, openAt, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for submitQueryJson - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param queryJson query to run (required) @@ -852,7 +893,7 @@ public okhttp3.Call submitQueryAsync(String namespace, String array, String type 0 error response - */ - public okhttp3.Call submitQueryJsonCall(String namespace, String array, String contentType, QueryJson queryJson, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitQueryJsonCall(String workspace, String teamspace, String array, String contentType, QueryJson queryJson, String xPayer, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -869,8 +910,9 @@ public okhttp3.Call submitQueryJsonCall(String namespace, String array, String c Object localVarPostBody = queryJson; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/query/submit_query_json" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/query/submit_query_json" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -908,10 +950,15 @@ public okhttp3.Call submitQueryJsonCall(String namespace, String array, String c } @SuppressWarnings("rawtypes") - private okhttp3.Call submitQueryJsonValidateBeforeCall(String namespace, String array, String contentType, QueryJson queryJson, String xPayer, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitQueryJson(Async)"); + private okhttp3.Call submitQueryJsonValidateBeforeCall(String workspace, String teamspace, String array, String contentType, QueryJson queryJson, String xPayer, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitQueryJson(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling submitQueryJson(Async)"); } // verify the required parameter 'array' is set @@ -929,14 +976,15 @@ private okhttp3.Call submitQueryJsonValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'queryJson' when calling submitQueryJson(Async)"); } - return submitQueryJsonCall(namespace, array, contentType, queryJson, xPayer, _callback); + return submitQueryJsonCall(workspace, teamspace, array, contentType, queryJson, xPayer, _callback); } /** * * send a query to run against a specified array/URI registered to a group/project, returns JSON results - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param queryJson query to run (required) @@ -951,15 +999,16 @@ private okhttp3.Call submitQueryJsonValidateBeforeCall(String namespace, String 0 error response - */ - public Object submitQueryJson(String namespace, String array, String contentType, QueryJson queryJson, String xPayer) throws ApiException { - ApiResponse localVarResp = submitQueryJsonWithHttpInfo(namespace, array, contentType, queryJson, xPayer); + public Object submitQueryJson(String workspace, String teamspace, String array, String contentType, QueryJson queryJson, String xPayer) throws ApiException { + ApiResponse localVarResp = submitQueryJsonWithHttpInfo(workspace, teamspace, array, contentType, queryJson, xPayer); return localVarResp.getData(); } /** * * send a query to run against a specified array/URI registered to a group/project, returns JSON results - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param queryJson query to run (required) @@ -974,8 +1023,8 @@ public Object submitQueryJson(String namespace, String array, String contentType 0 error response - */ - public ApiResponse submitQueryJsonWithHttpInfo(String namespace, String array, String contentType, QueryJson queryJson, String xPayer) throws ApiException { - okhttp3.Call localVarCall = submitQueryJsonValidateBeforeCall(namespace, array, contentType, queryJson, xPayer, null); + public ApiResponse submitQueryJsonWithHttpInfo(String workspace, String teamspace, String array, String contentType, QueryJson queryJson, String xPayer) throws ApiException { + okhttp3.Call localVarCall = submitQueryJsonValidateBeforeCall(workspace, teamspace, array, contentType, queryJson, xPayer, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -983,7 +1032,8 @@ public ApiResponse submitQueryJsonWithHttpInfo(String namespace, String /** * (asynchronously) * send a query to run against a specified array/URI registered to a group/project, returns JSON results - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param contentType Content Type of input and return mime (required) * @param queryJson query to run (required) @@ -999,9 +1049,9 @@ public ApiResponse submitQueryJsonWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call submitQueryJsonAsync(String namespace, String array, String contentType, QueryJson queryJson, String xPayer, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitQueryJsonAsync(String workspace, String teamspace, String array, String contentType, QueryJson queryJson, String xPayer, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitQueryJsonValidateBeforeCall(namespace, array, contentType, queryJson, xPayer, _callback); + okhttp3.Call localVarCall = submitQueryJsonValidateBeforeCall(workspace, teamspace, array, contentType, queryJson, xPayer, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApi.java index d204743..d4f950f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApi.java @@ -76,7 +76,7 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for deleteRegisteredTaskGraph - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -89,7 +89,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call deleteRegisteredTaskGraphCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteRegisteredTaskGraphCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -106,8 +106,8 @@ public okhttp3.Call deleteRegisteredTaskGraphCall(String namespace, String name, Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/registered/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/registered/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -136,10 +136,10 @@ public okhttp3.Call deleteRegisteredTaskGraphCall(String namespace, String name, } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteRegisteredTaskGraphValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteRegisteredTaskGraph(Async)"); + private okhttp3.Call deleteRegisteredTaskGraphValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteRegisteredTaskGraph(Async)"); } // verify the required parameter 'name' is set @@ -147,14 +147,14 @@ private okhttp3.Call deleteRegisteredTaskGraphValidateBeforeCall(String namespac throw new ApiException("Missing the required parameter 'name' when calling deleteRegisteredTaskGraph(Async)"); } - return deleteRegisteredTaskGraphCall(namespace, name, _callback); + return deleteRegisteredTaskGraphCall(workspace, name, _callback); } /** * * Delete the given registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -165,14 +165,14 @@ private okhttp3.Call deleteRegisteredTaskGraphValidateBeforeCall(String namespac 0 error response - */ - public void deleteRegisteredTaskGraph(String namespace, String name) throws ApiException { - deleteRegisteredTaskGraphWithHttpInfo(namespace, name); + public void deleteRegisteredTaskGraph(String workspace, String name) throws ApiException { + deleteRegisteredTaskGraphWithHttpInfo(workspace, name); } /** * * Delete the given registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -184,15 +184,15 @@ public void deleteRegisteredTaskGraph(String namespace, String name) throws ApiE 0 error response - */ - public ApiResponse deleteRegisteredTaskGraphWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteRegisteredTaskGraphValidateBeforeCall(namespace, name, null); + public ApiResponse deleteRegisteredTaskGraphWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteRegisteredTaskGraphValidateBeforeCall(workspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Delete the given registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -205,15 +205,15 @@ public ApiResponse deleteRegisteredTaskGraphWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call deleteRegisteredTaskGraphAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteRegisteredTaskGraphAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteRegisteredTaskGraphValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteRegisteredTaskGraphValidateBeforeCall(workspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for getRegisteredTaskGraph - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -226,7 +226,7 @@ public okhttp3.Call deleteRegisteredTaskGraphAsync(String namespace, String name 0 error response - */ - public okhttp3.Call getRegisteredTaskGraphCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getRegisteredTaskGraphCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -243,8 +243,8 @@ public okhttp3.Call getRegisteredTaskGraphCall(String namespace, String name, fi Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/registered/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/registered/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -273,10 +273,10 @@ public okhttp3.Call getRegisteredTaskGraphCall(String namespace, String name, fi } @SuppressWarnings("rawtypes") - private okhttp3.Call getRegisteredTaskGraphValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getRegisteredTaskGraph(Async)"); + private okhttp3.Call getRegisteredTaskGraphValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getRegisteredTaskGraph(Async)"); } // verify the required parameter 'name' is set @@ -284,14 +284,14 @@ private okhttp3.Call getRegisteredTaskGraphValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'name' when calling getRegisteredTaskGraph(Async)"); } - return getRegisteredTaskGraphCall(namespace, name, _callback); + return getRegisteredTaskGraphCall(workspace, name, _callback); } /** * * Fetch the contents of this registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @return RegisteredTaskGraph * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -303,15 +303,15 @@ private okhttp3.Call getRegisteredTaskGraphValidateBeforeCall(String namespace, 0 error response - */ - public RegisteredTaskGraph getRegisteredTaskGraph(String namespace, String name) throws ApiException { - ApiResponse localVarResp = getRegisteredTaskGraphWithHttpInfo(namespace, name); + public RegisteredTaskGraph getRegisteredTaskGraph(String workspace, String name) throws ApiException { + ApiResponse localVarResp = getRegisteredTaskGraphWithHttpInfo(workspace, name); return localVarResp.getData(); } /** * * Fetch the contents of this registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @return ApiResponse<RegisteredTaskGraph> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -323,8 +323,8 @@ public RegisteredTaskGraph getRegisteredTaskGraph(String namespace, String name) 0 error response - */ - public ApiResponse getRegisteredTaskGraphWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getRegisteredTaskGraphValidateBeforeCall(namespace, name, null); + public ApiResponse getRegisteredTaskGraphWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = getRegisteredTaskGraphValidateBeforeCall(workspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -332,7 +332,7 @@ public ApiResponse getRegisteredTaskGraphWithHttpInfo(Strin /** * (asynchronously) * Fetch the contents of this registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -345,16 +345,16 @@ public ApiResponse getRegisteredTaskGraphWithHttpInfo(Strin 0 error response - */ - public okhttp3.Call getRegisteredTaskGraphAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getRegisteredTaskGraphAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getRegisteredTaskGraphValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getRegisteredTaskGraphValidateBeforeCall(workspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getRegisteredTaskGraphSharingPolicies - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -368,7 +368,7 @@ public okhttp3.Call getRegisteredTaskGraphAsync(String namespace, String name, f 0 error response - */ - public okhttp3.Call getRegisteredTaskGraphSharingPoliciesCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getRegisteredTaskGraphSharingPoliciesCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -385,8 +385,8 @@ public okhttp3.Call getRegisteredTaskGraphSharingPoliciesCall(String namespace, Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/registered/{name}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/registered/{name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -415,10 +415,10 @@ public okhttp3.Call getRegisteredTaskGraphSharingPoliciesCall(String namespace, } @SuppressWarnings("rawtypes") - private okhttp3.Call getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getRegisteredTaskGraphSharingPolicies(Async)"); + private okhttp3.Call getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getRegisteredTaskGraphSharingPolicies(Async)"); } // verify the required parameter 'name' is set @@ -426,14 +426,14 @@ private okhttp3.Call getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(Str throw new ApiException("Missing the required parameter 'name' when calling getRegisteredTaskGraphSharingPolicies(Async)"); } - return getRegisteredTaskGraphSharingPoliciesCall(namespace, name, _callback); + return getRegisteredTaskGraphSharingPoliciesCall(workspace, name, _callback); } /** * * Get sharing policies for the task graph. - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @return List<TaskGraphSharing> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -446,15 +446,15 @@ private okhttp3.Call getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(Str 0 error response - */ - public List getRegisteredTaskGraphSharingPolicies(String namespace, String name) throws ApiException { - ApiResponse> localVarResp = getRegisteredTaskGraphSharingPoliciesWithHttpInfo(namespace, name); + public List getRegisteredTaskGraphSharingPolicies(String workspace, String name) throws ApiException { + ApiResponse> localVarResp = getRegisteredTaskGraphSharingPoliciesWithHttpInfo(workspace, name); return localVarResp.getData(); } /** * * Get sharing policies for the task graph. - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @return ApiResponse<List<TaskGraphSharing>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -467,8 +467,8 @@ public List getRegisteredTaskGraphSharingPolicies(String names 0 error response - */ - public ApiResponse> getRegisteredTaskGraphSharingPoliciesWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(namespace, name, null); + public ApiResponse> getRegisteredTaskGraphSharingPoliciesWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(workspace, name, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -476,7 +476,7 @@ public ApiResponse> getRegisteredTaskGraphSharingPolicies /** * (asynchronously) * Get sharing policies for the task graph. - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -490,16 +490,16 @@ public ApiResponse> getRegisteredTaskGraphSharingPolicies 0 error response - */ - public okhttp3.Call getRegisteredTaskGraphSharingPoliciesAsync(String namespace, String name, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getRegisteredTaskGraphSharingPoliciesAsync(String workspace, String name, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getRegisteredTaskGraphSharingPoliciesValidateBeforeCall(workspace, name, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for registerRegisteredTaskGraph - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph Task graph to register. (optional) * @param _callback Callback for upload/download progress @@ -513,7 +513,7 @@ public okhttp3.Call getRegisteredTaskGraphSharingPoliciesAsync(String namespace, 0 error response - */ - public okhttp3.Call registerRegisteredTaskGraphCall(String namespace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerRegisteredTaskGraphCall(String workspace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -530,8 +530,8 @@ public okhttp3.Call registerRegisteredTaskGraphCall(String namespace, String nam Object localVarPostBody = graph; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/registered/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/registered/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -561,10 +561,10 @@ public okhttp3.Call registerRegisteredTaskGraphCall(String namespace, String nam } @SuppressWarnings("rawtypes") - private okhttp3.Call registerRegisteredTaskGraphValidateBeforeCall(String namespace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling registerRegisteredTaskGraph(Async)"); + private okhttp3.Call registerRegisteredTaskGraphValidateBeforeCall(String workspace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling registerRegisteredTaskGraph(Async)"); } // verify the required parameter 'name' is set @@ -572,14 +572,14 @@ private okhttp3.Call registerRegisteredTaskGraphValidateBeforeCall(String namesp throw new ApiException("Missing the required parameter 'name' when calling registerRegisteredTaskGraph(Async)"); } - return registerRegisteredTaskGraphCall(namespace, name, graph, _callback); + return registerRegisteredTaskGraphCall(workspace, name, graph, _callback); } /** * * Register a task graph in the given namespace, with the given name. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph Task graph to register. (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -591,14 +591,14 @@ private okhttp3.Call registerRegisteredTaskGraphValidateBeforeCall(String namesp 0 error response - */ - public void registerRegisteredTaskGraph(String namespace, String name, RegisteredTaskGraph graph) throws ApiException { - registerRegisteredTaskGraphWithHttpInfo(namespace, name, graph); + public void registerRegisteredTaskGraph(String workspace, String name, RegisteredTaskGraph graph) throws ApiException { + registerRegisteredTaskGraphWithHttpInfo(workspace, name, graph); } /** * * Register a task graph in the given namespace, with the given name. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph Task graph to register. (optional) * @return ApiResponse<Void> @@ -611,15 +611,15 @@ public void registerRegisteredTaskGraph(String namespace, String name, Registere 0 error response - */ - public ApiResponse registerRegisteredTaskGraphWithHttpInfo(String namespace, String name, RegisteredTaskGraph graph) throws ApiException { - okhttp3.Call localVarCall = registerRegisteredTaskGraphValidateBeforeCall(namespace, name, graph, null); + public ApiResponse registerRegisteredTaskGraphWithHttpInfo(String workspace, String name, RegisteredTaskGraph graph) throws ApiException { + okhttp3.Call localVarCall = registerRegisteredTaskGraphValidateBeforeCall(workspace, name, graph, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Register a task graph in the given namespace, with the given name. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph Task graph to register. (optional) * @param _callback The callback to be executed when the API call finishes @@ -633,15 +633,15 @@ public ApiResponse registerRegisteredTaskGraphWithHttpInfo(String namespac 0 error response - */ - public okhttp3.Call registerRegisteredTaskGraphAsync(String namespace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerRegisteredTaskGraphAsync(String workspace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = registerRegisteredTaskGraphValidateBeforeCall(namespace, name, graph, _callback); + okhttp3.Call localVarCall = registerRegisteredTaskGraphValidateBeforeCall(workspace, name, graph, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for shareRegisteredTaskGraph - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @param taskGraphSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @param _callback Callback for upload/download progress @@ -656,7 +656,7 @@ public okhttp3.Call registerRegisteredTaskGraphAsync(String namespace, String na 0 error response - */ - public okhttp3.Call shareRegisteredTaskGraphCall(String namespace, String name, TaskGraphSharing taskGraphSharing, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareRegisteredTaskGraphCall(String workspace, String name, TaskGraphSharing taskGraphSharing, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -673,8 +673,8 @@ public okhttp3.Call shareRegisteredTaskGraphCall(String namespace, String name, Object localVarPostBody = taskGraphSharing; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/registered/{name}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/registered/{name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -704,10 +704,10 @@ public okhttp3.Call shareRegisteredTaskGraphCall(String namespace, String name, } @SuppressWarnings("rawtypes") - private okhttp3.Call shareRegisteredTaskGraphValidateBeforeCall(String namespace, String name, TaskGraphSharing taskGraphSharing, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling shareRegisteredTaskGraph(Async)"); + private okhttp3.Call shareRegisteredTaskGraphValidateBeforeCall(String workspace, String name, TaskGraphSharing taskGraphSharing, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shareRegisteredTaskGraph(Async)"); } // verify the required parameter 'name' is set @@ -720,14 +720,14 @@ private okhttp3.Call shareRegisteredTaskGraphValidateBeforeCall(String namespace throw new ApiException("Missing the required parameter 'taskGraphSharing' when calling shareRegisteredTaskGraph(Async)"); } - return shareRegisteredTaskGraphCall(namespace, name, taskGraphSharing, _callback); + return shareRegisteredTaskGraphCall(workspace, name, taskGraphSharing, _callback); } /** * * Share a task graph. - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @param taskGraphSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -740,14 +740,14 @@ private okhttp3.Call shareRegisteredTaskGraphValidateBeforeCall(String namespace 0 error response - */ - public void shareRegisteredTaskGraph(String namespace, String name, TaskGraphSharing taskGraphSharing) throws ApiException { - shareRegisteredTaskGraphWithHttpInfo(namespace, name, taskGraphSharing); + public void shareRegisteredTaskGraph(String workspace, String name, TaskGraphSharing taskGraphSharing) throws ApiException { + shareRegisteredTaskGraphWithHttpInfo(workspace, name, taskGraphSharing); } /** * * Share a task graph. - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @param taskGraphSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @return ApiResponse<Void> @@ -761,15 +761,15 @@ public void shareRegisteredTaskGraph(String namespace, String name, TaskGraphSha 0 error response - */ - public ApiResponse shareRegisteredTaskGraphWithHttpInfo(String namespace, String name, TaskGraphSharing taskGraphSharing) throws ApiException { - okhttp3.Call localVarCall = shareRegisteredTaskGraphValidateBeforeCall(namespace, name, taskGraphSharing, null); + public ApiResponse shareRegisteredTaskGraphWithHttpInfo(String workspace, String name, TaskGraphSharing taskGraphSharing) throws ApiException { + okhttp3.Call localVarCall = shareRegisteredTaskGraphValidateBeforeCall(workspace, name, taskGraphSharing, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Share a task graph. - * @param namespace The namespace that owns the registered task graph. (required) + * @param workspace The workspace that owns the registered task graph. (required) * @param name The name of the task graph. (required) * @param taskGraphSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @param _callback The callback to be executed when the API call finishes @@ -784,15 +784,15 @@ public ApiResponse shareRegisteredTaskGraphWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call shareRegisteredTaskGraphAsync(String namespace, String name, TaskGraphSharing taskGraphSharing, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareRegisteredTaskGraphAsync(String workspace, String name, TaskGraphSharing taskGraphSharing, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shareRegisteredTaskGraphValidateBeforeCall(namespace, name, taskGraphSharing, _callback); + okhttp3.Call localVarCall = shareRegisteredTaskGraphValidateBeforeCall(workspace, name, taskGraphSharing, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for updateRegisteredTaskGraph - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph The new contents of the task graph. (optional) * @param _callback Callback for upload/download progress @@ -806,7 +806,7 @@ public okhttp3.Call shareRegisteredTaskGraphAsync(String namespace, String name, 0 error response - */ - public okhttp3.Call updateRegisteredTaskGraphCall(String namespace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateRegisteredTaskGraphCall(String workspace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -823,8 +823,8 @@ public okhttp3.Call updateRegisteredTaskGraphCall(String namespace, String name, Object localVarPostBody = graph; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/registered/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/registered/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -854,10 +854,10 @@ public okhttp3.Call updateRegisteredTaskGraphCall(String namespace, String name, } @SuppressWarnings("rawtypes") - private okhttp3.Call updateRegisteredTaskGraphValidateBeforeCall(String namespace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateRegisteredTaskGraph(Async)"); + private okhttp3.Call updateRegisteredTaskGraphValidateBeforeCall(String workspace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateRegisteredTaskGraph(Async)"); } // verify the required parameter 'name' is set @@ -865,14 +865,14 @@ private okhttp3.Call updateRegisteredTaskGraphValidateBeforeCall(String namespac throw new ApiException("Missing the required parameter 'name' when calling updateRegisteredTaskGraph(Async)"); } - return updateRegisteredTaskGraphCall(namespace, name, graph, _callback); + return updateRegisteredTaskGraphCall(workspace, name, graph, _callback); } /** * * Update the contents of an existing registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph The new contents of the task graph. (optional) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -884,14 +884,14 @@ private okhttp3.Call updateRegisteredTaskGraphValidateBeforeCall(String namespac 0 error response - */ - public void updateRegisteredTaskGraph(String namespace, String name, RegisteredTaskGraph graph) throws ApiException { - updateRegisteredTaskGraphWithHttpInfo(namespace, name, graph); + public void updateRegisteredTaskGraph(String workspace, String name, RegisteredTaskGraph graph) throws ApiException { + updateRegisteredTaskGraphWithHttpInfo(workspace, name, graph); } /** * * Update the contents of an existing registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph The new contents of the task graph. (optional) * @return ApiResponse<Void> @@ -904,15 +904,15 @@ public void updateRegisteredTaskGraph(String namespace, String name, RegisteredT 0 error response - */ - public ApiResponse updateRegisteredTaskGraphWithHttpInfo(String namespace, String name, RegisteredTaskGraph graph) throws ApiException { - okhttp3.Call localVarCall = updateRegisteredTaskGraphValidateBeforeCall(namespace, name, graph, null); + public ApiResponse updateRegisteredTaskGraphWithHttpInfo(String workspace, String name, RegisteredTaskGraph graph) throws ApiException { + okhttp3.Call localVarCall = updateRegisteredTaskGraphValidateBeforeCall(workspace, name, graph, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Update the contents of an existing registered task graph. - * @param namespace The namespace that owns this registered UDF. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name The name of the registered task graph. (required) * @param graph The new contents of the task graph. (optional) * @param _callback The callback to be executed when the API call finishes @@ -926,9 +926,9 @@ public ApiResponse updateRegisteredTaskGraphWithHttpInfo(String namespace, 0 error response - */ - public okhttp3.Call updateRegisteredTaskGraphAsync(String namespace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateRegisteredTaskGraphAsync(String workspace, String name, RegisteredTaskGraph graph, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateRegisteredTaskGraphValidateBeforeCall(namespace, name, graph, _callback); + okhttp3.Call localVarCall = updateRegisteredTaskGraphValidateBeforeCall(workspace, name, graph, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/SqlApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/SqlApi.java index bcdd50a..13e46d2 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/SqlApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/SqlApi.java @@ -75,7 +75,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for runSQL - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @param _callback Callback for upload/download progress @@ -90,7 +91,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call runSQLCall(String namespace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { + public okhttp3.Call runSQLCall(String workspace, String teamspace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -107,8 +108,9 @@ public okhttp3.Call runSQLCall(String namespace, SQLParameters sql, String accep Object localVarPostBody = sql; // create path and map variables - String localVarPath = "/sql/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/sql/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -141,10 +143,15 @@ public okhttp3.Call runSQLCall(String namespace, SQLParameters sql, String accep } @SuppressWarnings("rawtypes") - private okhttp3.Call runSQLValidateBeforeCall(String namespace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling runSQL(Async)"); + private okhttp3.Call runSQLValidateBeforeCall(String workspace, String teamspace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling runSQL(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling runSQL(Async)"); } // verify the required parameter 'sql' is set @@ -152,14 +159,15 @@ private okhttp3.Call runSQLValidateBeforeCall(String namespace, SQLParameters sq throw new ApiException("Missing the required parameter 'sql' when calling runSQL(Async)"); } - return runSQLCall(namespace, sql, acceptEncoding, _callback); + return runSQLCall(workspace, teamspace, sql, acceptEncoding, _callback); } /** * * Run a sql query - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @return List<Map<String, Object>> @@ -173,15 +181,16 @@ private okhttp3.Call runSQLValidateBeforeCall(String namespace, SQLParameters sq 0 error response - */ - public List> runSQL(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - ApiResponse>> localVarResp = runSQLWithHttpInfo(namespace, sql, acceptEncoding); + public List> runSQL(String workspace, String teamspace, SQLParameters sql, String acceptEncoding) throws ApiException { + ApiResponse>> localVarResp = runSQLWithHttpInfo(workspace, teamspace, sql, acceptEncoding); return localVarResp.getData(); } /** * * Run a sql query - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @return ApiResponse<List<Map<String, Object>>> @@ -195,8 +204,8 @@ public List> runSQL(String namespace, SQLParameters sql, Str 0 error response - */ - public ApiResponse>> runSQLWithHttpInfo(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = runSQLValidateBeforeCall(namespace, sql, acceptEncoding, null); + public ApiResponse>> runSQLWithHttpInfo(String workspace, String teamspace, SQLParameters sql, String acceptEncoding) throws ApiException { + okhttp3.Call localVarCall = runSQLValidateBeforeCall(workspace, teamspace, sql, acceptEncoding, null); Type localVarReturnType = new TypeToken>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -204,7 +213,8 @@ public ApiResponse>> runSQLWithHttpInfo(String namespac /** * (asynchronously) * Run a sql query - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @param _callback The callback to be executed when the API call finishes @@ -219,9 +229,9 @@ public ApiResponse>> runSQLWithHttpInfo(String namespac 0 error response - */ - public okhttp3.Call runSQLAsync(String namespace, SQLParameters sql, String acceptEncoding, final ApiCallback>> _callback) throws ApiException { + public okhttp3.Call runSQLAsync(String workspace, String teamspace, SQLParameters sql, String acceptEncoding, final ApiCallback>> _callback) throws ApiException { - okhttp3.Call localVarCall = runSQLValidateBeforeCall(namespace, sql, acceptEncoding, _callback); + okhttp3.Call localVarCall = runSQLValidateBeforeCall(workspace, teamspace, sql, acceptEncoding, _callback); Type localVarReturnType = new TypeToken>>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -243,8 +253,8 @@ public okhttp3.Call runSQLAsync(String namespace, SQLParameters sql, String acce 0 error response - */ - public ApiResponse runSQLWithHttpInfoBytes(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = runSQLValidateBeforeCall(namespace, sql, acceptEncoding, null); + public ApiResponse runSQLWithHttpInfoBytes(String workspace, String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { + okhttp3.Call localVarCall = runSQLValidateBeforeCall(workspace, namespace, sql, acceptEncoding, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -265,8 +275,8 @@ public ApiResponse runSQLWithHttpInfoBytes(String namespace, SQLParamete 0 error response - */ - public byte[] runSQLBytes(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = runSQLWithHttpInfoBytes(namespace, sql, acceptEncoding); + public byte[] runSQLBytes(String workspace, String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { + ApiResponse localVarResp = runSQLWithHttpInfoBytes(workspace, namespace, sql, acceptEncoding); return localVarResp.getData(); } } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApi.java index f9fb203..9d8d43e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApi.java @@ -78,7 +78,7 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for createTaskGraphLog - * @param namespace The namespace that will own this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param log (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -91,7 +91,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call createTaskGraphLogCall(String namespace, TaskGraphLog log, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createTaskGraphLogCall(String workspace, TaskGraphLog log, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -108,8 +108,8 @@ public okhttp3.Call createTaskGraphLogCall(String namespace, TaskGraphLog log, f Object localVarPostBody = log; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/log" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/taskgraphs/{workspace}/log" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -138,10 +138,10 @@ public okhttp3.Call createTaskGraphLogCall(String namespace, TaskGraphLog log, f } @SuppressWarnings("rawtypes") - private okhttp3.Call createTaskGraphLogValidateBeforeCall(String namespace, TaskGraphLog log, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling createTaskGraphLog(Async)"); + private okhttp3.Call createTaskGraphLogValidateBeforeCall(String workspace, TaskGraphLog log, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling createTaskGraphLog(Async)"); } // verify the required parameter 'log' is set @@ -149,14 +149,14 @@ private okhttp3.Call createTaskGraphLogValidateBeforeCall(String namespace, Task throw new ApiException("Missing the required parameter 'log' when calling createTaskGraphLog(Async)"); } - return createTaskGraphLogCall(namespace, log, _callback); + return createTaskGraphLogCall(workspace, log, _callback); } /** * * Create a task graph log. - * @param namespace The namespace that will own this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param log (required) * @return TaskGraphLog * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -168,15 +168,15 @@ private okhttp3.Call createTaskGraphLogValidateBeforeCall(String namespace, Task 0 error response - */ - public TaskGraphLog createTaskGraphLog(String namespace, TaskGraphLog log) throws ApiException { - ApiResponse localVarResp = createTaskGraphLogWithHttpInfo(namespace, log); + public TaskGraphLog createTaskGraphLog(String workspace, TaskGraphLog log) throws ApiException { + ApiResponse localVarResp = createTaskGraphLogWithHttpInfo(workspace, log); return localVarResp.getData(); } /** * * Create a task graph log. - * @param namespace The namespace that will own this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param log (required) * @return ApiResponse<TaskGraphLog> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -188,8 +188,8 @@ public TaskGraphLog createTaskGraphLog(String namespace, TaskGraphLog log) throw 0 error response - */ - public ApiResponse createTaskGraphLogWithHttpInfo(String namespace, TaskGraphLog log) throws ApiException { - okhttp3.Call localVarCall = createTaskGraphLogValidateBeforeCall(namespace, log, null); + public ApiResponse createTaskGraphLogWithHttpInfo(String workspace, TaskGraphLog log) throws ApiException { + okhttp3.Call localVarCall = createTaskGraphLogValidateBeforeCall(workspace, log, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -197,7 +197,7 @@ public ApiResponse createTaskGraphLogWithHttpInfo(String namespace /** * (asynchronously) * Create a task graph log. - * @param namespace The namespace that will own this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param log (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -210,16 +210,16 @@ public ApiResponse createTaskGraphLogWithHttpInfo(String namespace 0 error response - */ - public okhttp3.Call createTaskGraphLogAsync(String namespace, TaskGraphLog log, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createTaskGraphLogAsync(String workspace, TaskGraphLog log, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = createTaskGraphLogValidateBeforeCall(namespace, log, _callback); + okhttp3.Call localVarCall = createTaskGraphLogValidateBeforeCall(workspace, log, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getTaskGraphLog - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -232,7 +232,7 @@ public okhttp3.Call createTaskGraphLogAsync(String namespace, TaskGraphLog log, 0 error response - */ - public okhttp3.Call getTaskGraphLogCall(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getTaskGraphLogCall(String workspace, String id, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -249,8 +249,8 @@ public okhttp3.Call getTaskGraphLogCall(String namespace, String id, final ApiCa Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/logs/{id}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/logs/{id}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -279,10 +279,10 @@ public okhttp3.Call getTaskGraphLogCall(String namespace, String id, final ApiCa } @SuppressWarnings("rawtypes") - private okhttp3.Call getTaskGraphLogValidateBeforeCall(String namespace, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getTaskGraphLog(Async)"); + private okhttp3.Call getTaskGraphLogValidateBeforeCall(String workspace, String id, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getTaskGraphLog(Async)"); } // verify the required parameter 'id' is set @@ -290,14 +290,14 @@ private okhttp3.Call getTaskGraphLogValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'id' when calling getTaskGraphLog(Async)"); } - return getTaskGraphLogCall(namespace, id, _callback); + return getTaskGraphLogCall(workspace, id, _callback); } /** * * Fetch information about a single task graph execution. - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @return TaskGraphLog * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -309,15 +309,15 @@ private okhttp3.Call getTaskGraphLogValidateBeforeCall(String namespace, String 0 error response - */ - public TaskGraphLog getTaskGraphLog(String namespace, String id) throws ApiException { - ApiResponse localVarResp = getTaskGraphLogWithHttpInfo(namespace, id); + public TaskGraphLog getTaskGraphLog(String workspace, String id) throws ApiException { + ApiResponse localVarResp = getTaskGraphLogWithHttpInfo(workspace, id); return localVarResp.getData(); } /** * * Fetch information about a single task graph execution. - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @return ApiResponse<TaskGraphLog> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -329,8 +329,8 @@ public TaskGraphLog getTaskGraphLog(String namespace, String id) throws ApiExcep 0 error response - */ - public ApiResponse getTaskGraphLogWithHttpInfo(String namespace, String id) throws ApiException { - okhttp3.Call localVarCall = getTaskGraphLogValidateBeforeCall(namespace, id, null); + public ApiResponse getTaskGraphLogWithHttpInfo(String workspace, String id) throws ApiException { + okhttp3.Call localVarCall = getTaskGraphLogValidateBeforeCall(workspace, id, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -338,7 +338,7 @@ public ApiResponse getTaskGraphLogWithHttpInfo(String namespace, S /** * (asynchronously) * Fetch information about a single task graph execution. - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -351,9 +351,9 @@ public ApiResponse getTaskGraphLogWithHttpInfo(String namespace, S 0 error response - */ - public okhttp3.Call getTaskGraphLogAsync(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getTaskGraphLogAsync(String workspace, String id, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getTaskGraphLogValidateBeforeCall(namespace, id, _callback); + okhttp3.Call localVarCall = getTaskGraphLogValidateBeforeCall(workspace, id, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -545,7 +545,7 @@ public okhttp3.Call listTaskGraphLogsAsync(String namespace, String createdBy, S } /** * Build call for reportClientNode - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param report The node status to report. (required) * @param _callback Callback for upload/download progress @@ -559,7 +559,7 @@ public okhttp3.Call listTaskGraphLogsAsync(String namespace, String createdBy, S 0 error response - */ - public okhttp3.Call reportClientNodeCall(String namespace, String id, TaskGraphClientNodeStatus report, final ApiCallback _callback) throws ApiException { + public okhttp3.Call reportClientNodeCall(String workspace, String id, TaskGraphClientNodeStatus report, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -576,8 +576,8 @@ public okhttp3.Call reportClientNodeCall(String namespace, String id, TaskGraphC Object localVarPostBody = report; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/logs/{id}/report_client_node" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/logs/{id}/report_client_node" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -607,10 +607,10 @@ public okhttp3.Call reportClientNodeCall(String namespace, String id, TaskGraphC } @SuppressWarnings("rawtypes") - private okhttp3.Call reportClientNodeValidateBeforeCall(String namespace, String id, TaskGraphClientNodeStatus report, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling reportClientNode(Async)"); + private okhttp3.Call reportClientNodeValidateBeforeCall(String workspace, String id, TaskGraphClientNodeStatus report, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling reportClientNode(Async)"); } // verify the required parameter 'id' is set @@ -623,14 +623,14 @@ private okhttp3.Call reportClientNodeValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'report' when calling reportClientNode(Async)"); } - return reportClientNodeCall(namespace, id, report, _callback); + return reportClientNodeCall(workspace, id, report, _callback); } /** * * - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param report The node status to report. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -642,14 +642,14 @@ private okhttp3.Call reportClientNodeValidateBeforeCall(String namespace, String 0 error response - */ - public void reportClientNode(String namespace, String id, TaskGraphClientNodeStatus report) throws ApiException { - reportClientNodeWithHttpInfo(namespace, id, report); + public void reportClientNode(String workspace, String id, TaskGraphClientNodeStatus report) throws ApiException { + reportClientNodeWithHttpInfo(workspace, id, report); } /** * * - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param report The node status to report. (required) * @return ApiResponse<Void> @@ -662,15 +662,15 @@ public void reportClientNode(String namespace, String id, TaskGraphClientNodeSta 0 error response - */ - public ApiResponse reportClientNodeWithHttpInfo(String namespace, String id, TaskGraphClientNodeStatus report) throws ApiException { - okhttp3.Call localVarCall = reportClientNodeValidateBeforeCall(namespace, id, report, null); + public ApiResponse reportClientNodeWithHttpInfo(String workspace, String id, TaskGraphClientNodeStatus report) throws ApiException { + okhttp3.Call localVarCall = reportClientNodeValidateBeforeCall(workspace, id, report, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param report The node status to report. (required) * @param _callback The callback to be executed when the API call finishes @@ -684,15 +684,15 @@ public ApiResponse reportClientNodeWithHttpInfo(String namespace, String i 0 error response - */ - public okhttp3.Call reportClientNodeAsync(String namespace, String id, TaskGraphClientNodeStatus report, final ApiCallback _callback) throws ApiException { + public okhttp3.Call reportClientNodeAsync(String workspace, String id, TaskGraphClientNodeStatus report, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = reportClientNodeValidateBeforeCall(namespace, id, report, _callback); + okhttp3.Call localVarCall = reportClientNodeValidateBeforeCall(workspace, id, report, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for resubmitTaskGraphExecution - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -705,7 +705,7 @@ public okhttp3.Call reportClientNodeAsync(String namespace, String id, TaskGraph 0 error response - */ - public okhttp3.Call resubmitTaskGraphExecutionCall(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call resubmitTaskGraphExecutionCall(String workspace, String id, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -722,8 +722,8 @@ public okhttp3.Call resubmitTaskGraphExecutionCall(String namespace, String id, Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/executions/{id}/resubmit" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/executions/{id}/resubmit" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -752,10 +752,10 @@ public okhttp3.Call resubmitTaskGraphExecutionCall(String namespace, String id, } @SuppressWarnings("rawtypes") - private okhttp3.Call resubmitTaskGraphExecutionValidateBeforeCall(String namespace, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling resubmitTaskGraphExecution(Async)"); + private okhttp3.Call resubmitTaskGraphExecutionValidateBeforeCall(String workspace, String id, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling resubmitTaskGraphExecution(Async)"); } // verify the required parameter 'id' is set @@ -763,14 +763,14 @@ private okhttp3.Call resubmitTaskGraphExecutionValidateBeforeCall(String namespa throw new ApiException("Missing the required parameter 'id' when calling resubmitTaskGraphExecution(Async)"); } - return resubmitTaskGraphExecutionCall(namespace, id, _callback); + return resubmitTaskGraphExecutionCall(workspace, id, _callback); } /** * * Resubmits a task graph in the given namespace using the associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @return TaskGraphLog * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -782,15 +782,15 @@ private okhttp3.Call resubmitTaskGraphExecutionValidateBeforeCall(String namespa 0 error response - */ - public TaskGraphLog resubmitTaskGraphExecution(String namespace, String id) throws ApiException { - ApiResponse localVarResp = resubmitTaskGraphExecutionWithHttpInfo(namespace, id); + public TaskGraphLog resubmitTaskGraphExecution(String workspace, String id) throws ApiException { + ApiResponse localVarResp = resubmitTaskGraphExecutionWithHttpInfo(workspace, id); return localVarResp.getData(); } /** * * Resubmits a task graph in the given namespace using the associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @return ApiResponse<TaskGraphLog> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -802,8 +802,8 @@ public TaskGraphLog resubmitTaskGraphExecution(String namespace, String id) thro 0 error response - */ - public ApiResponse resubmitTaskGraphExecutionWithHttpInfo(String namespace, String id) throws ApiException { - okhttp3.Call localVarCall = resubmitTaskGraphExecutionValidateBeforeCall(namespace, id, null); + public ApiResponse resubmitTaskGraphExecutionWithHttpInfo(String workspace, String id) throws ApiException { + okhttp3.Call localVarCall = resubmitTaskGraphExecutionValidateBeforeCall(workspace, id, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -811,7 +811,7 @@ public ApiResponse resubmitTaskGraphExecutionWithHttpInfo(String n /** * (asynchronously) * Resubmits a task graph in the given namespace using the associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -824,16 +824,16 @@ public ApiResponse resubmitTaskGraphExecutionWithHttpInfo(String n 0 error response - */ - public okhttp3.Call resubmitTaskGraphExecutionAsync(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call resubmitTaskGraphExecutionAsync(String workspace, String id, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = resubmitTaskGraphExecutionValidateBeforeCall(namespace, id, _callback); + okhttp3.Call localVarCall = resubmitTaskGraphExecutionValidateBeforeCall(workspace, id, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for retryTaskGraphExecution - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -846,7 +846,7 @@ public okhttp3.Call resubmitTaskGraphExecutionAsync(String namespace, String id, 0 error response - */ - public okhttp3.Call retryTaskGraphExecutionCall(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call retryTaskGraphExecutionCall(String workspace, String id, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -863,8 +863,8 @@ public okhttp3.Call retryTaskGraphExecutionCall(String namespace, String id, fin Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/executions/{id}/retry" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/executions/{id}/retry" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -893,10 +893,10 @@ public okhttp3.Call retryTaskGraphExecutionCall(String namespace, String id, fin } @SuppressWarnings("rawtypes") - private okhttp3.Call retryTaskGraphExecutionValidateBeforeCall(String namespace, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling retryTaskGraphExecution(Async)"); + private okhttp3.Call retryTaskGraphExecutionValidateBeforeCall(String workspace, String id, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling retryTaskGraphExecution(Async)"); } // verify the required parameter 'id' is set @@ -904,14 +904,14 @@ private okhttp3.Call retryTaskGraphExecutionValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'id' when calling retryTaskGraphExecution(Async)"); } - return retryTaskGraphExecutionCall(namespace, id, _callback); + return retryTaskGraphExecutionCall(workspace, id, _callback); } /** * * Retries failed tasks of a task graph in the given namespace using the associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @return TaskGraphLog * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -923,15 +923,15 @@ private okhttp3.Call retryTaskGraphExecutionValidateBeforeCall(String namespace, 0 error response - */ - public TaskGraphLog retryTaskGraphExecution(String namespace, String id) throws ApiException { - ApiResponse localVarResp = retryTaskGraphExecutionWithHttpInfo(namespace, id); + public TaskGraphLog retryTaskGraphExecution(String workspace, String id) throws ApiException { + ApiResponse localVarResp = retryTaskGraphExecutionWithHttpInfo(workspace, id); return localVarResp.getData(); } /** * * Retries failed tasks of a task graph in the given namespace using the associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @return ApiResponse<TaskGraphLog> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -943,8 +943,8 @@ public TaskGraphLog retryTaskGraphExecution(String namespace, String id) throws 0 error response - */ - public ApiResponse retryTaskGraphExecutionWithHttpInfo(String namespace, String id) throws ApiException { - okhttp3.Call localVarCall = retryTaskGraphExecutionValidateBeforeCall(namespace, id, null); + public ApiResponse retryTaskGraphExecutionWithHttpInfo(String workspace, String id) throws ApiException { + okhttp3.Call localVarCall = retryTaskGraphExecutionValidateBeforeCall(workspace, id, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -952,7 +952,7 @@ public ApiResponse retryTaskGraphExecutionWithHttpInfo(String name /** * (asynchronously) * Retries failed tasks of a task graph in the given namespace using the associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -965,16 +965,16 @@ public ApiResponse retryTaskGraphExecutionWithHttpInfo(String name 0 error response - */ - public okhttp3.Call retryTaskGraphExecutionAsync(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call retryTaskGraphExecutionAsync(String workspace, String id, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = retryTaskGraphExecutionValidateBeforeCall(namespace, id, _callback); + okhttp3.Call localVarCall = retryTaskGraphExecutionValidateBeforeCall(workspace, id, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for stopTaskGraphExecution - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -987,7 +987,7 @@ public okhttp3.Call retryTaskGraphExecutionAsync(String namespace, String id, fi 0 error response - */ - public okhttp3.Call stopTaskGraphExecutionCall(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call stopTaskGraphExecutionCall(String workspace, String id, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1004,8 +1004,8 @@ public okhttp3.Call stopTaskGraphExecutionCall(String namespace, String id, fina Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/executions/{id}/stop" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/executions/{id}/stop" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -1034,10 +1034,10 @@ public okhttp3.Call stopTaskGraphExecutionCall(String namespace, String id, fina } @SuppressWarnings("rawtypes") - private okhttp3.Call stopTaskGraphExecutionValidateBeforeCall(String namespace, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling stopTaskGraphExecution(Async)"); + private okhttp3.Call stopTaskGraphExecutionValidateBeforeCall(String workspace, String id, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling stopTaskGraphExecution(Async)"); } // verify the required parameter 'id' is set @@ -1045,14 +1045,14 @@ private okhttp3.Call stopTaskGraphExecutionValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'id' when calling stopTaskGraphExecution(Async)"); } - return stopTaskGraphExecutionCall(namespace, id, _callback); + return stopTaskGraphExecutionCall(workspace, id, _callback); } /** * * Stops a task graph execution in the given namespace using the associated associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1063,14 +1063,14 @@ private okhttp3.Call stopTaskGraphExecutionValidateBeforeCall(String namespace, 0 error response - */ - public void stopTaskGraphExecution(String namespace, String id) throws ApiException { - stopTaskGraphExecutionWithHttpInfo(namespace, id); + public void stopTaskGraphExecution(String workspace, String id) throws ApiException { + stopTaskGraphExecutionWithHttpInfo(workspace, id); } /** * * Stops a task graph execution in the given namespace using the associated associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1082,15 +1082,15 @@ public void stopTaskGraphExecution(String namespace, String id) throws ApiExcept 0 error response - */ - public ApiResponse stopTaskGraphExecutionWithHttpInfo(String namespace, String id) throws ApiException { - okhttp3.Call localVarCall = stopTaskGraphExecutionValidateBeforeCall(namespace, id, null); + public ApiResponse stopTaskGraphExecutionWithHttpInfo(String workspace, String id) throws ApiException { + okhttp3.Call localVarCall = stopTaskGraphExecutionValidateBeforeCall(workspace, id, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Stops a task graph execution in the given namespace using the associated associated execution id. - * @param namespace The namespace that owns this task graph execution. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph execution (TaskGraphLog). (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1103,16 +1103,17 @@ public ApiResponse stopTaskGraphExecutionWithHttpInfo(String namespace, St 0 error response - */ - public okhttp3.Call stopTaskGraphExecutionAsync(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call stopTaskGraphExecutionAsync(String workspace, String id, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = stopTaskGraphExecutionValidateBeforeCall(namespace, id, _callback); + okhttp3.Call localVarCall = stopTaskGraphExecutionValidateBeforeCall(workspace, id, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for submitTaskGraph - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -1124,7 +1125,7 @@ public okhttp3.Call stopTaskGraphExecutionAsync(String namespace, String id, fin 0 error response - */ - public okhttp3.Call submitTaskGraphCall(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitTaskGraphCall(String workspace, String id, String rootTaskGraphUuid, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1141,8 +1142,8 @@ public okhttp3.Call submitTaskGraphCall(String namespace, String id, final ApiCa Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/graphs/{id}/submit" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/graphs/{id}/submit" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -1151,6 +1152,10 @@ public okhttp3.Call submitTaskGraphCall(String namespace, String id, final ApiCa Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); + if (rootTaskGraphUuid != null) { + localVarQueryParams.addAll(localVarApiClient.parameterToPair("root_task_graph_uuid", rootTaskGraphUuid)); + } + final String[] localVarAccepts = { "application/json" }; @@ -1171,10 +1176,10 @@ public okhttp3.Call submitTaskGraphCall(String namespace, String id, final ApiCa } @SuppressWarnings("rawtypes") - private okhttp3.Call submitTaskGraphValidateBeforeCall(String namespace, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitTaskGraph(Async)"); + private okhttp3.Call submitTaskGraphValidateBeforeCall(String workspace, String id, String rootTaskGraphUuid, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitTaskGraph(Async)"); } // verify the required parameter 'id' is set @@ -1182,15 +1187,16 @@ private okhttp3.Call submitTaskGraphValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'id' when calling submitTaskGraph(Async)"); } - return submitTaskGraphCall(namespace, id, _callback); + return submitTaskGraphCall(workspace, id, rootTaskGraphUuid, _callback); } /** * * Submit a single task graph for execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @return TaskGraphLog * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1201,16 +1207,17 @@ private okhttp3.Call submitTaskGraphValidateBeforeCall(String namespace, String 0 error response - */ - public TaskGraphLog submitTaskGraph(String namespace, String id) throws ApiException { - ApiResponse localVarResp = submitTaskGraphWithHttpInfo(namespace, id); + public TaskGraphLog submitTaskGraph(String workspace, String id, String rootTaskGraphUuid) throws ApiException { + ApiResponse localVarResp = submitTaskGraphWithHttpInfo(workspace, id, rootTaskGraphUuid); return localVarResp.getData(); } /** * * Submit a single task graph for execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @return ApiResponse<TaskGraphLog> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1221,8 +1228,8 @@ public TaskGraphLog submitTaskGraph(String namespace, String id) throws ApiExcep 0 error response - */ - public ApiResponse submitTaskGraphWithHttpInfo(String namespace, String id) throws ApiException { - okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(namespace, id, null); + public ApiResponse submitTaskGraphWithHttpInfo(String workspace, String id, String rootTaskGraphUuid) throws ApiException { + okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(workspace, id, rootTaskGraphUuid, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1230,8 +1237,9 @@ public ApiResponse submitTaskGraphWithHttpInfo(String namespace, S /** * (asynchronously) * Submit a single task graph for execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -1243,16 +1251,16 @@ public ApiResponse submitTaskGraphWithHttpInfo(String namespace, S 0 error response - */ - public okhttp3.Call submitTaskGraphAsync(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitTaskGraphAsync(String workspace, String id, String rootTaskGraphUuid, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(namespace, id, _callback); + okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(workspace, id, rootTaskGraphUuid, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for updateTaskGraphLog - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param log Updates to make to the task graph log. The only manual update that a client should need to make to a task graph log is to update its completion status to `succeeded`, `failed`, or `cancelled`. (required) * @param _callback Callback for upload/download progress @@ -1266,7 +1274,7 @@ public okhttp3.Call submitTaskGraphAsync(String namespace, String id, final ApiC 0 error response - */ - public okhttp3.Call updateTaskGraphLogCall(String namespace, String id, TaskGraphLog log, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateTaskGraphLogCall(String workspace, String id, TaskGraphLog log, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1283,8 +1291,8 @@ public okhttp3.Call updateTaskGraphLogCall(String namespace, String id, TaskGrap Object localVarPostBody = log; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/logs/{id}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/logs/{id}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -1314,10 +1322,10 @@ public okhttp3.Call updateTaskGraphLogCall(String namespace, String id, TaskGrap } @SuppressWarnings("rawtypes") - private okhttp3.Call updateTaskGraphLogValidateBeforeCall(String namespace, String id, TaskGraphLog log, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateTaskGraphLog(Async)"); + private okhttp3.Call updateTaskGraphLogValidateBeforeCall(String workspace, String id, TaskGraphLog log, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateTaskGraphLog(Async)"); } // verify the required parameter 'id' is set @@ -1330,14 +1338,14 @@ private okhttp3.Call updateTaskGraphLogValidateBeforeCall(String namespace, Stri throw new ApiException("Missing the required parameter 'log' when calling updateTaskGraphLog(Async)"); } - return updateTaskGraphLogCall(namespace, id, log, _callback); + return updateTaskGraphLogCall(workspace, id, log, _callback); } /** * * Update information about a single task graph execution. - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param log Updates to make to the task graph log. The only manual update that a client should need to make to a task graph log is to update its completion status to `succeeded`, `failed`, or `cancelled`. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1349,14 +1357,14 @@ private okhttp3.Call updateTaskGraphLogValidateBeforeCall(String namespace, Stri 0 error response - */ - public void updateTaskGraphLog(String namespace, String id, TaskGraphLog log) throws ApiException { - updateTaskGraphLogWithHttpInfo(namespace, id, log); + public void updateTaskGraphLog(String workspace, String id, TaskGraphLog log) throws ApiException { + updateTaskGraphLogWithHttpInfo(workspace, id, log); } /** * * Update information about a single task graph execution. - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param log Updates to make to the task graph log. The only manual update that a client should need to make to a task graph log is to update its completion status to `succeeded`, `failed`, or `cancelled`. (required) * @return ApiResponse<Void> @@ -1369,15 +1377,15 @@ public void updateTaskGraphLog(String namespace, String id, TaskGraphLog log) th 0 error response - */ - public ApiResponse updateTaskGraphLogWithHttpInfo(String namespace, String id, TaskGraphLog log) throws ApiException { - okhttp3.Call localVarCall = updateTaskGraphLogValidateBeforeCall(namespace, id, log, null); + public ApiResponse updateTaskGraphLogWithHttpInfo(String workspace, String id, TaskGraphLog log) throws ApiException { + okhttp3.Call localVarCall = updateTaskGraphLogValidateBeforeCall(workspace, id, log, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Update information about a single task graph execution. - * @param namespace The namespace that owns this task graph log. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph log entry. (required) * @param log Updates to make to the task graph log. The only manual update that a client should need to make to a task graph log is to update its completion status to `succeeded`, `failed`, or `cancelled`. (required) * @param _callback The callback to be executed when the API call finishes @@ -1391,9 +1399,9 @@ public ApiResponse updateTaskGraphLogWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call updateTaskGraphLogAsync(String namespace, String id, TaskGraphLog log, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateTaskGraphLogAsync(String workspace, String id, TaskGraphLog log, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateTaskGraphLogValidateBeforeCall(namespace, id, log, _callback); + okhttp3.Call localVarCall = updateTaskGraphLogValidateBeforeCall(workspace, id, log, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphsApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphsApi.java index d8cd4d8..5642af4 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphsApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/TaskGraphsApi.java @@ -77,7 +77,7 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for createTaskGraph - * @param namespace Include graphs for this namespace. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param graph Create the task graph. (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -90,7 +90,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call createTaskGraphCall(String namespace, TaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createTaskGraphCall(String workspace, TaskGraph graph, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -107,8 +107,8 @@ public okhttp3.Call createTaskGraphCall(String namespace, TaskGraph graph, final Object localVarPostBody = graph; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/graphs" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/taskgraphs/{workspace}/graphs" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -137,10 +137,10 @@ public okhttp3.Call createTaskGraphCall(String namespace, TaskGraph graph, final } @SuppressWarnings("rawtypes") - private okhttp3.Call createTaskGraphValidateBeforeCall(String namespace, TaskGraph graph, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling createTaskGraph(Async)"); + private okhttp3.Call createTaskGraphValidateBeforeCall(String workspace, TaskGraph graph, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling createTaskGraph(Async)"); } // verify the required parameter 'graph' is set @@ -148,14 +148,14 @@ private okhttp3.Call createTaskGraphValidateBeforeCall(String namespace, TaskGra throw new ApiException("Missing the required parameter 'graph' when calling createTaskGraph(Async)"); } - return createTaskGraphCall(namespace, graph, _callback); + return createTaskGraphCall(workspace, graph, _callback); } /** * * Create a single task graph for execution. - * @param namespace Include graphs for this namespace. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param graph Create the task graph. (required) * @return TaskGraph * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -167,15 +167,15 @@ private okhttp3.Call createTaskGraphValidateBeforeCall(String namespace, TaskGra 0 error response - */ - public TaskGraph createTaskGraph(String namespace, TaskGraph graph) throws ApiException { - ApiResponse localVarResp = createTaskGraphWithHttpInfo(namespace, graph); + public TaskGraph createTaskGraph(String workspace, TaskGraph graph) throws ApiException { + ApiResponse localVarResp = createTaskGraphWithHttpInfo(workspace, graph); return localVarResp.getData(); } /** * * Create a single task graph for execution. - * @param namespace Include graphs for this namespace. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param graph Create the task graph. (required) * @return ApiResponse<TaskGraph> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -187,8 +187,8 @@ public TaskGraph createTaskGraph(String namespace, TaskGraph graph) throws ApiEx 0 error response - */ - public ApiResponse createTaskGraphWithHttpInfo(String namespace, TaskGraph graph) throws ApiException { - okhttp3.Call localVarCall = createTaskGraphValidateBeforeCall(namespace, graph, null); + public ApiResponse createTaskGraphWithHttpInfo(String workspace, TaskGraph graph) throws ApiException { + okhttp3.Call localVarCall = createTaskGraphValidateBeforeCall(workspace, graph, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -196,7 +196,7 @@ public ApiResponse createTaskGraphWithHttpInfo(String namespace, Task /** * (asynchronously) * Create a single task graph for execution. - * @param namespace Include graphs for this namespace. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param graph Create the task graph. (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -209,16 +209,16 @@ public ApiResponse createTaskGraphWithHttpInfo(String namespace, Task 0 error response - */ - public okhttp3.Call createTaskGraphAsync(String namespace, TaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call createTaskGraphAsync(String workspace, TaskGraph graph, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = createTaskGraphValidateBeforeCall(namespace, graph, _callback); + okhttp3.Call localVarCall = createTaskGraphValidateBeforeCall(workspace, graph, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getTaskGraph - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -231,7 +231,7 @@ public okhttp3.Call createTaskGraphAsync(String namespace, TaskGraph graph, fina 0 error response - */ - public okhttp3.Call getTaskGraphCall(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getTaskGraphCall(String workspace, String id, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -248,8 +248,8 @@ public okhttp3.Call getTaskGraphCall(String namespace, String id, final ApiCallb Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/graphs/{id}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/graphs/{id}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -278,10 +278,10 @@ public okhttp3.Call getTaskGraphCall(String namespace, String id, final ApiCallb } @SuppressWarnings("rawtypes") - private okhttp3.Call getTaskGraphValidateBeforeCall(String namespace, String id, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getTaskGraph(Async)"); + private okhttp3.Call getTaskGraphValidateBeforeCall(String workspace, String id, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getTaskGraph(Async)"); } // verify the required parameter 'id' is set @@ -289,14 +289,14 @@ private okhttp3.Call getTaskGraphValidateBeforeCall(String namespace, String id, throw new ApiException("Missing the required parameter 'id' when calling getTaskGraph(Async)"); } - return getTaskGraphCall(namespace, id, _callback); + return getTaskGraphCall(workspace, id, _callback); } /** * * Fetch information about a single task graph. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @return TaskGraph * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -308,15 +308,15 @@ private okhttp3.Call getTaskGraphValidateBeforeCall(String namespace, String id, 0 error response - */ - public TaskGraph getTaskGraph(String namespace, String id) throws ApiException { - ApiResponse localVarResp = getTaskGraphWithHttpInfo(namespace, id); + public TaskGraph getTaskGraph(String workspace, String id) throws ApiException { + ApiResponse localVarResp = getTaskGraphWithHttpInfo(workspace, id); return localVarResp.getData(); } /** * * Fetch information about a single task graph. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @return ApiResponse<TaskGraph> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -328,8 +328,8 @@ public TaskGraph getTaskGraph(String namespace, String id) throws ApiException { 0 error response - */ - public ApiResponse getTaskGraphWithHttpInfo(String namespace, String id) throws ApiException { - okhttp3.Call localVarCall = getTaskGraphValidateBeforeCall(namespace, id, null); + public ApiResponse getTaskGraphWithHttpInfo(String workspace, String id) throws ApiException { + okhttp3.Call localVarCall = getTaskGraphValidateBeforeCall(workspace, id, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -337,7 +337,7 @@ public ApiResponse getTaskGraphWithHttpInfo(String namespace, String /** * (asynchronously) * Fetch information about a single task graph. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -350,16 +350,16 @@ public ApiResponse getTaskGraphWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call getTaskGraphAsync(String namespace, String id, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getTaskGraphAsync(String workspace, String id, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getTaskGraphValidateBeforeCall(namespace, id, _callback); + okhttp3.Call localVarCall = getTaskGraphValidateBeforeCall(workspace, id, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for listTaskGraphs - * @param namespace Namespace for graphs (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -371,7 +371,7 @@ public okhttp3.Call getTaskGraphAsync(String namespace, String id, final ApiCall 0 error response - */ - public okhttp3.Call listTaskGraphsCall(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call listTaskGraphsCall(String workspace, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -388,8 +388,8 @@ public okhttp3.Call listTaskGraphsCall(String namespace, final ApiCallback _call Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/graphs" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/taskgraphs/{workspace}/graphs" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -417,20 +417,20 @@ public okhttp3.Call listTaskGraphsCall(String namespace, final ApiCallback _call } @SuppressWarnings("rawtypes") - private okhttp3.Call listTaskGraphsValidateBeforeCall(String namespace, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling listTaskGraphs(Async)"); + private okhttp3.Call listTaskGraphsValidateBeforeCall(String workspace, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling listTaskGraphs(Async)"); } - return listTaskGraphsCall(namespace, _callback); + return listTaskGraphsCall(workspace, _callback); } /** * * Fetch the task graphs of a namespace the user has access to. The returned entries will include only summary data, and will not include information about the individual tasks that were executed. (This information is available when requesting an individual task graph log.) Entries in the response are ordered from newest to oldest. Pagination parameters work as in other API methods; see PaginationMetadata. - * @param namespace Namespace for graphs (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @return TaskGraphs * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -441,15 +441,15 @@ private okhttp3.Call listTaskGraphsValidateBeforeCall(String namespace, final Ap 0 error response - */ - public TaskGraphs listTaskGraphs(String namespace) throws ApiException { - ApiResponse localVarResp = listTaskGraphsWithHttpInfo(namespace); + public TaskGraphs listTaskGraphs(String workspace) throws ApiException { + ApiResponse localVarResp = listTaskGraphsWithHttpInfo(workspace); return localVarResp.getData(); } /** * * Fetch the task graphs of a namespace the user has access to. The returned entries will include only summary data, and will not include information about the individual tasks that were executed. (This information is available when requesting an individual task graph log.) Entries in the response are ordered from newest to oldest. Pagination parameters work as in other API methods; see PaginationMetadata. - * @param namespace Namespace for graphs (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @return ApiResponse<TaskGraphs> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -460,8 +460,8 @@ public TaskGraphs listTaskGraphs(String namespace) throws ApiException { 0 error response - */ - public ApiResponse listTaskGraphsWithHttpInfo(String namespace) throws ApiException { - okhttp3.Call localVarCall = listTaskGraphsValidateBeforeCall(namespace, null); + public ApiResponse listTaskGraphsWithHttpInfo(String workspace) throws ApiException { + okhttp3.Call localVarCall = listTaskGraphsValidateBeforeCall(workspace, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -469,7 +469,7 @@ public ApiResponse listTaskGraphsWithHttpInfo(String namespace) thro /** * (asynchronously) * Fetch the task graphs of a namespace the user has access to. The returned entries will include only summary data, and will not include information about the individual tasks that were executed. (This information is available when requesting an individual task graph log.) Entries in the response are ordered from newest to oldest. Pagination parameters work as in other API methods; see PaginationMetadata. - * @param namespace Namespace for graphs (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -481,17 +481,18 @@ public ApiResponse listTaskGraphsWithHttpInfo(String namespace) thro 0 error response - */ - public okhttp3.Call listTaskGraphsAsync(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call listTaskGraphsAsync(String workspace, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = listTaskGraphsValidateBeforeCall(namespace, _callback); + okhttp3.Call localVarCall = listTaskGraphsValidateBeforeCall(workspace, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for submitTaskGraph - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -503,7 +504,7 @@ public okhttp3.Call listTaskGraphsAsync(String namespace, final ApiCallback 0 error response - */ - public okhttp3.Call submitTaskGraphCall(String namespace, String id, String rootId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitTaskGraphCall(String workspace, String id, String rootTaskGraphUuid, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -520,8 +521,8 @@ public okhttp3.Call submitTaskGraphCall(String namespace, String id, String root Object localVarPostBody = null; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/graphs/{id}/submit" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/graphs/{id}/submit" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -530,8 +531,8 @@ public okhttp3.Call submitTaskGraphCall(String namespace, String id, String root Map localVarCookieParams = new HashMap(); Map localVarFormParams = new HashMap(); - if (rootId != null) { - localVarQueryParams.addAll(localVarApiClient.parameterToPair("root_task_graph_uuid", rootId)); + if (rootTaskGraphUuid != null) { + localVarQueryParams.addAll(localVarApiClient.parameterToPair("root_task_graph_uuid", rootTaskGraphUuid)); } final String[] localVarAccepts = { @@ -554,10 +555,10 @@ public okhttp3.Call submitTaskGraphCall(String namespace, String id, String root } @SuppressWarnings("rawtypes") - private okhttp3.Call submitTaskGraphValidateBeforeCall(String namespace, String id, String rootId, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitTaskGraph(Async)"); + private okhttp3.Call submitTaskGraphValidateBeforeCall(String workspace, String id, String rootTaskGraphUuid, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitTaskGraph(Async)"); } // verify the required parameter 'id' is set @@ -565,15 +566,16 @@ private okhttp3.Call submitTaskGraphValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'id' when calling submitTaskGraph(Async)"); } - return submitTaskGraphCall(namespace, id, rootId, _callback); + return submitTaskGraphCall(workspace, id, rootTaskGraphUuid, _callback); } /** * * Submit a single task graph for execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @return TaskGraphLog * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -584,16 +586,17 @@ private okhttp3.Call submitTaskGraphValidateBeforeCall(String namespace, String 0 error response - */ - public TaskGraphLog submitTaskGraph(String namespace, String id, String rootId) throws ApiException { - ApiResponse localVarResp = submitTaskGraphWithHttpInfo(namespace, id, rootId); + public TaskGraphLog submitTaskGraph(String workspace, String id, String rootTaskGraphUuid) throws ApiException { + ApiResponse localVarResp = submitTaskGraphWithHttpInfo(workspace, id, rootTaskGraphUuid); return localVarResp.getData(); } /** * * Submit a single task graph for execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @return ApiResponse<TaskGraphLog> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -604,8 +607,8 @@ public TaskGraphLog submitTaskGraph(String namespace, String id, String rootId) 0 error response - */ - public ApiResponse submitTaskGraphWithHttpInfo(String namespace, String id, String rootId) throws ApiException { - okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(namespace, id, rootId, null); + public ApiResponse submitTaskGraphWithHttpInfo(String workspace, String id, String rootTaskGraphUuid) throws ApiException { + okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(workspace, id, rootTaskGraphUuid, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -613,8 +616,9 @@ public ApiResponse submitTaskGraphWithHttpInfo(String namespace, S /** * (asynchronously) * Submit a single task graph for execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) + * @param rootTaskGraphUuid UUID of the root taskgraph that this graph is assosiated with (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -626,16 +630,16 @@ public ApiResponse submitTaskGraphWithHttpInfo(String namespace, S 0 error response - */ - public okhttp3.Call submitTaskGraphAsync(String namespace, String id, String rootId, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitTaskGraphAsync(String workspace, String id, String rootTaskGraphUuid, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(namespace, id, rootId, _callback); + okhttp3.Call localVarCall = submitTaskGraphValidateBeforeCall(workspace, id, rootTaskGraphUuid, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for updateTaskGraph - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @param graph Updates to make to the task graph. (required) * @param _callback Callback for upload/download progress @@ -649,7 +653,7 @@ public okhttp3.Call submitTaskGraphAsync(String namespace, String id, String roo 0 error response - */ - public okhttp3.Call updateTaskGraphCall(String namespace, String id, TaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateTaskGraphCall(String workspace, String id, TaskGraph graph, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -666,8 +670,8 @@ public okhttp3.Call updateTaskGraphCall(String namespace, String id, TaskGraph g Object localVarPostBody = graph; // create path and map variables - String localVarPath = "/taskgraphs/{namespace}/graphs/{id}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/taskgraphs/{workspace}/graphs/{id}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "id" + "}", localVarApiClient.escapeString(id.toString())); List localVarQueryParams = new ArrayList(); @@ -697,10 +701,10 @@ public okhttp3.Call updateTaskGraphCall(String namespace, String id, TaskGraph g } @SuppressWarnings("rawtypes") - private okhttp3.Call updateTaskGraphValidateBeforeCall(String namespace, String id, TaskGraph graph, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateTaskGraph(Async)"); + private okhttp3.Call updateTaskGraphValidateBeforeCall(String workspace, String id, TaskGraph graph, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateTaskGraph(Async)"); } // verify the required parameter 'id' is set @@ -713,14 +717,14 @@ private okhttp3.Call updateTaskGraphValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'graph' when calling updateTaskGraph(Async)"); } - return updateTaskGraphCall(namespace, id, graph, _callback); + return updateTaskGraphCall(workspace, id, graph, _callback); } /** * * Update information about a single task graph execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @param graph Updates to make to the task graph. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -732,14 +736,14 @@ private okhttp3.Call updateTaskGraphValidateBeforeCall(String namespace, String 0 error response - */ - public void updateTaskGraph(String namespace, String id, TaskGraph graph) throws ApiException { - updateTaskGraphWithHttpInfo(namespace, id, graph); + public void updateTaskGraph(String workspace, String id, TaskGraph graph) throws ApiException { + updateTaskGraphWithHttpInfo(workspace, id, graph); } /** * * Update information about a single task graph execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @param graph Updates to make to the task graph. (required) * @return ApiResponse<Void> @@ -752,15 +756,15 @@ public void updateTaskGraph(String namespace, String id, TaskGraph graph) throws 0 error response - */ - public ApiResponse updateTaskGraphWithHttpInfo(String namespace, String id, TaskGraph graph) throws ApiException { - okhttp3.Call localVarCall = updateTaskGraphValidateBeforeCall(namespace, id, graph, null); + public ApiResponse updateTaskGraphWithHttpInfo(String workspace, String id, TaskGraph graph) throws ApiException { + okhttp3.Call localVarCall = updateTaskGraphValidateBeforeCall(workspace, id, graph, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Update information about a single task graph execution. - * @param namespace The namespace that owns this task graph. (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param id The UUID of the task graph entry. (required) * @param graph Updates to make to the task graph. (required) * @param _callback The callback to be executed when the API call finishes @@ -774,9 +778,9 @@ public ApiResponse updateTaskGraphWithHttpInfo(String namespace, String id 0 error response - */ - public okhttp3.Call updateTaskGraphAsync(String namespace, String id, TaskGraph graph, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateTaskGraphAsync(String workspace, String id, TaskGraph graph, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateTaskGraphValidateBeforeCall(namespace, id, graph, _callback); + okhttp3.Call localVarCall = updateTaskGraphValidateBeforeCall(workspace, id, graph, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/TasksApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/TasksApi.java index 078670c..3b9c052 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/TasksApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/TasksApi.java @@ -77,7 +77,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for runSQL - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @param _callback Callback for upload/download progress @@ -92,7 +93,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call runSQLCall(String namespace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { + public okhttp3.Call runSQLCall(String workspace, String teamspace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -109,8 +110,9 @@ public okhttp3.Call runSQLCall(String namespace, SQLParameters sql, String accep Object localVarPostBody = sql; // create path and map variables - String localVarPath = "/sql/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/sql/{workspace}/{teamspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -143,10 +145,15 @@ public okhttp3.Call runSQLCall(String namespace, SQLParameters sql, String accep } @SuppressWarnings("rawtypes") - private okhttp3.Call runSQLValidateBeforeCall(String namespace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling runSQL(Async)"); + private okhttp3.Call runSQLValidateBeforeCall(String workspace, String teamspace, SQLParameters sql, String acceptEncoding, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling runSQL(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling runSQL(Async)"); } // verify the required parameter 'sql' is set @@ -154,14 +161,15 @@ private okhttp3.Call runSQLValidateBeforeCall(String namespace, SQLParameters sq throw new ApiException("Missing the required parameter 'sql' when calling runSQL(Async)"); } - return runSQLCall(namespace, sql, acceptEncoding, _callback); + return runSQLCall(workspace, teamspace, sql, acceptEncoding, _callback); } /** * * Run a sql query - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @return List<Map<String, Object>> @@ -175,15 +183,16 @@ private okhttp3.Call runSQLValidateBeforeCall(String namespace, SQLParameters sq 0 error response - */ - public List> runSQL(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - ApiResponse>> localVarResp = runSQLWithHttpInfo(namespace, sql, acceptEncoding); + public List> runSQL(String workspace, String teamspace, SQLParameters sql, String acceptEncoding) throws ApiException { + ApiResponse>> localVarResp = runSQLWithHttpInfo(workspace, teamspace, sql, acceptEncoding); return localVarResp.getData(); } /** * * Run a sql query - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @return ApiResponse<List<Map<String, Object>>> @@ -197,8 +206,8 @@ public List> runSQL(String namespace, SQLParameters sql, Str 0 error response - */ - public ApiResponse>> runSQLWithHttpInfo(String namespace, SQLParameters sql, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = runSQLValidateBeforeCall(namespace, sql, acceptEncoding, null); + public ApiResponse>> runSQLWithHttpInfo(String workspace, String teamspace, SQLParameters sql, String acceptEncoding) throws ApiException { + okhttp3.Call localVarCall = runSQLValidateBeforeCall(workspace, teamspace, sql, acceptEncoding, null); Type localVarReturnType = new TypeToken>>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -206,7 +215,8 @@ public ApiResponse>> runSQLWithHttpInfo(String namespac /** * (asynchronously) * Run a sql query - * @param namespace namespace to run task under is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the sql query belongs to (required) * @param sql sql being submitted (required) * @param acceptEncoding Encoding to use (optional) * @param _callback The callback to be executed when the API call finishes @@ -221,9 +231,9 @@ public ApiResponse>> runSQLWithHttpInfo(String namespac 0 error response - */ - public okhttp3.Call runSQLAsync(String namespace, SQLParameters sql, String acceptEncoding, final ApiCallback>> _callback) throws ApiException { + public okhttp3.Call runSQLAsync(String workspace, String teamspace, SQLParameters sql, String acceptEncoding, final ApiCallback>> _callback) throws ApiException { - okhttp3.Call localVarCall = runSQLValidateBeforeCall(namespace, sql, acceptEncoding, _callback); + okhttp3.Call localVarCall = runSQLValidateBeforeCall(workspace, teamspace, sql, acceptEncoding, _callback); Type localVarReturnType = new TypeToken>>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/UdfApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/UdfApi.java index 4eb656b..8ddb5bc 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/UdfApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/UdfApi.java @@ -83,7 +83,7 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for deleteUDFInfo - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -96,7 +96,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call deleteUDFInfoCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteUDFInfoCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -113,8 +113,8 @@ public okhttp3.Call deleteUDFInfoCall(String namespace, String name, final ApiCa Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -143,10 +143,10 @@ public okhttp3.Call deleteUDFInfoCall(String namespace, String name, final ApiCa } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteUDFInfoValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteUDFInfo(Async)"); + private okhttp3.Call deleteUDFInfoValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteUDFInfo(Async)"); } // verify the required parameter 'name' is set @@ -154,14 +154,14 @@ private okhttp3.Call deleteUDFInfoValidateBeforeCall(String namespace, String na throw new ApiException("Missing the required parameter 'name' when calling deleteUDFInfo(Async)"); } - return deleteUDFInfoCall(namespace, name, _callback); + return deleteUDFInfoCall(workspace, name, _callback); } /** * * delete a registered UDF -- this will remove all sharing and can not be undone - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -172,14 +172,14 @@ private okhttp3.Call deleteUDFInfoValidateBeforeCall(String namespace, String na 0 error response - */ - public void deleteUDFInfo(String namespace, String name) throws ApiException { - deleteUDFInfoWithHttpInfo(namespace, name); + public void deleteUDFInfo(String workspace, String name) throws ApiException { + deleteUDFInfoWithHttpInfo(workspace, name); } /** * * delete a registered UDF -- this will remove all sharing and can not be undone - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -191,15 +191,15 @@ public void deleteUDFInfo(String namespace, String name) throws ApiException { 0 error response - */ - public ApiResponse deleteUDFInfoWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteUDFInfoValidateBeforeCall(namespace, name, null); + public ApiResponse deleteUDFInfoWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteUDFInfoValidateBeforeCall(workspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * delete a registered UDF -- this will remove all sharing and can not be undone - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -212,15 +212,15 @@ public ApiResponse deleteUDFInfoWithHttpInfo(String namespace, String name 0 error response - */ - public okhttp3.Call deleteUDFInfoAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteUDFInfoAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteUDFInfoValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteUDFInfoValidateBeforeCall(workspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for getUDFInfo - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -234,7 +234,7 @@ public okhttp3.Call deleteUDFInfoAsync(String namespace, String name, final ApiC 0 error response - */ - public okhttp3.Call getUDFInfoCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getUDFInfoCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -251,8 +251,8 @@ public okhttp3.Call getUDFInfoCall(String namespace, String name, final ApiCallb Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -281,10 +281,10 @@ public okhttp3.Call getUDFInfoCall(String namespace, String name, final ApiCallb } @SuppressWarnings("rawtypes") - private okhttp3.Call getUDFInfoValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getUDFInfo(Async)"); + private okhttp3.Call getUDFInfoValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getUDFInfo(Async)"); } // verify the required parameter 'name' is set @@ -292,14 +292,14 @@ private okhttp3.Call getUDFInfoValidateBeforeCall(String namespace, String name, throw new ApiException("Missing the required parameter 'name' when calling getUDFInfo(Async)"); } - return getUDFInfoCall(namespace, name, _callback); + return getUDFInfoCall(workspace, name, _callback); } /** * * get a specific UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @return UDFInfo * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -312,15 +312,15 @@ private okhttp3.Call getUDFInfoValidateBeforeCall(String namespace, String name, 0 error response - */ - public UDFInfo getUDFInfo(String namespace, String name) throws ApiException { - ApiResponse localVarResp = getUDFInfoWithHttpInfo(namespace, name); + public UDFInfo getUDFInfo(String workspace, String name) throws ApiException { + ApiResponse localVarResp = getUDFInfoWithHttpInfo(workspace, name); return localVarResp.getData(); } /** * * get a specific UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @return ApiResponse<UDFInfo> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -333,8 +333,8 @@ public UDFInfo getUDFInfo(String namespace, String name) throws ApiException { 0 error response - */ - public ApiResponse getUDFInfoWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getUDFInfoValidateBeforeCall(namespace, name, null); + public ApiResponse getUDFInfoWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = getUDFInfoValidateBeforeCall(workspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -342,7 +342,7 @@ public ApiResponse getUDFInfoWithHttpInfo(String namespace, String name /** * (asynchronously) * get a specific UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -356,16 +356,16 @@ public ApiResponse getUDFInfoWithHttpInfo(String namespace, String name 0 error response - */ - public okhttp3.Call getUDFInfoAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getUDFInfoAsync(String workspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getUDFInfoValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getUDFInfoValidateBeforeCall(workspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for getUDFInfoSharingPolicies - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -379,7 +379,7 @@ public okhttp3.Call getUDFInfoAsync(String namespace, String name, final ApiCall 0 error response - */ - public okhttp3.Call getUDFInfoSharingPoliciesCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getUDFInfoSharingPoliciesCall(String workspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -396,8 +396,8 @@ public okhttp3.Call getUDFInfoSharingPoliciesCall(String namespace, String name, Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -426,10 +426,10 @@ public okhttp3.Call getUDFInfoSharingPoliciesCall(String namespace, String name, } @SuppressWarnings("rawtypes") - private okhttp3.Call getUDFInfoSharingPoliciesValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling getUDFInfoSharingPolicies(Async)"); + private okhttp3.Call getUDFInfoSharingPoliciesValidateBeforeCall(String workspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling getUDFInfoSharingPolicies(Async)"); } // verify the required parameter 'name' is set @@ -437,14 +437,14 @@ private okhttp3.Call getUDFInfoSharingPoliciesValidateBeforeCall(String namespac throw new ApiException("Missing the required parameter 'name' when calling getUDFInfoSharingPolicies(Async)"); } - return getUDFInfoSharingPoliciesCall(namespace, name, _callback); + return getUDFInfoSharingPoliciesCall(workspace, name, _callback); } /** * * Get all sharing details of the UDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @return List<UDFSharing> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -457,15 +457,15 @@ private okhttp3.Call getUDFInfoSharingPoliciesValidateBeforeCall(String namespac 0 error response - */ - public List getUDFInfoSharingPolicies(String namespace, String name) throws ApiException { - ApiResponse> localVarResp = getUDFInfoSharingPoliciesWithHttpInfo(namespace, name); + public List getUDFInfoSharingPolicies(String workspace, String name) throws ApiException { + ApiResponse> localVarResp = getUDFInfoSharingPoliciesWithHttpInfo(workspace, name); return localVarResp.getData(); } /** * * Get all sharing details of the UDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @return ApiResponse<List<UDFSharing>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -478,8 +478,8 @@ public List getUDFInfoSharingPolicies(String namespace, String name) 0 error response - */ - public ApiResponse> getUDFInfoSharingPoliciesWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = getUDFInfoSharingPoliciesValidateBeforeCall(namespace, name, null); + public ApiResponse> getUDFInfoSharingPoliciesWithHttpInfo(String workspace, String name) throws ApiException { + okhttp3.Call localVarCall = getUDFInfoSharingPoliciesValidateBeforeCall(workspace, name, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -487,7 +487,7 @@ public ApiResponse> getUDFInfoSharingPoliciesWithHttpInfo(Strin /** * (asynchronously) * Get all sharing details of the UDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -501,16 +501,16 @@ public ApiResponse> getUDFInfoSharingPoliciesWithHttpInfo(Strin 0 error response - */ - public okhttp3.Call getUDFInfoSharingPoliciesAsync(String namespace, String name, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call getUDFInfoSharingPoliciesAsync(String workspace, String name, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = getUDFInfoSharingPoliciesValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = getUDFInfoSharingPoliciesValidateBeforeCall(workspace, name, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for handleCopyUDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udFCopy Input/Output information to copy a UDF (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -526,7 +526,7 @@ public okhttp3.Call getUDFInfoSharingPoliciesAsync(String namespace, String name 0 error response - */ - public okhttp3.Call handleCopyUDFCall(String namespace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleCopyUDFCall(String workspace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -543,8 +543,8 @@ public okhttp3.Call handleCopyUDFCall(String namespace, String name, UDFCopy udF Object localVarPostBody = udFCopy; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}/copy" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}/copy" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -582,10 +582,10 @@ public okhttp3.Call handleCopyUDFCall(String namespace, String name, UDFCopy udF } @SuppressWarnings("rawtypes") - private okhttp3.Call handleCopyUDFValidateBeforeCall(String namespace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling handleCopyUDF(Async)"); + private okhttp3.Call handleCopyUDFValidateBeforeCall(String workspace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling handleCopyUDF(Async)"); } // verify the required parameter 'name' is set @@ -598,14 +598,14 @@ private okhttp3.Call handleCopyUDFValidateBeforeCall(String namespace, String na throw new ApiException("Missing the required parameter 'udFCopy' when calling handleCopyUDF(Async)"); } - return handleCopyUDFCall(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); + return handleCopyUDFCall(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); } /** * * Copy a tiledb udf at the specified location - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udFCopy Input/Output information to copy a UDF (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -620,15 +620,15 @@ private okhttp3.Call handleCopyUDFValidateBeforeCall(String namespace, String na 0 error response - */ - public UDFCopied handleCopyUDF(String namespace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { - ApiResponse localVarResp = handleCopyUDFWithHttpInfo(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); + public UDFCopied handleCopyUDF(String workspace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { + ApiResponse localVarResp = handleCopyUDFWithHttpInfo(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); return localVarResp.getData(); } /** * * Copy a tiledb udf at the specified location - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udFCopy Input/Output information to copy a UDF (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -643,8 +643,8 @@ public UDFCopied handleCopyUDF(String namespace, String name, UDFCopy udFCopy, S 0 error response - */ - public ApiResponse handleCopyUDFWithHttpInfo(String namespace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { - okhttp3.Call localVarCall = handleCopyUDFValidateBeforeCall(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, null); + public ApiResponse handleCopyUDFWithHttpInfo(String workspace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp) throws ApiException { + okhttp3.Call localVarCall = handleCopyUDFValidateBeforeCall(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -652,7 +652,7 @@ public ApiResponse handleCopyUDFWithHttpInfo(String namespace, String /** * (asynchronously) * Copy a tiledb udf at the specified location - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udFCopy Input/Output information to copy a UDF (required) * @param X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME Optional registered access credentials to use for creation (optional) @@ -668,16 +668,16 @@ public ApiResponse handleCopyUDFWithHttpInfo(String namespace, String 0 error response - */ - public okhttp3.Call handleCopyUDFAsync(String namespace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { + public okhttp3.Call handleCopyUDFAsync(String workspace, String name, UDFCopy udFCopy, String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, Integer endTimestamp, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = handleCopyUDFValidateBeforeCall(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); + okhttp3.Call localVarCall = handleCopyUDFValidateBeforeCall(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for registerUDFInfo - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to register (required) * @param _callback Callback for upload/download progress @@ -691,7 +691,7 @@ public okhttp3.Call handleCopyUDFAsync(String namespace, String name, UDFCopy ud 0 error response - */ - public okhttp3.Call registerUDFInfoCall(String namespace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerUDFInfoCall(String workspace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -708,8 +708,8 @@ public okhttp3.Call registerUDFInfoCall(String namespace, String name, UDFInfoUp Object localVarPostBody = udf; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -739,10 +739,10 @@ public okhttp3.Call registerUDFInfoCall(String namespace, String name, UDFInfoUp } @SuppressWarnings("rawtypes") - private okhttp3.Call registerUDFInfoValidateBeforeCall(String namespace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling registerUDFInfo(Async)"); + private okhttp3.Call registerUDFInfoValidateBeforeCall(String workspace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling registerUDFInfo(Async)"); } // verify the required parameter 'name' is set @@ -755,14 +755,14 @@ private okhttp3.Call registerUDFInfoValidateBeforeCall(String namespace, String throw new ApiException("Missing the required parameter 'udf' when calling registerUDFInfo(Async)"); } - return registerUDFInfoCall(namespace, name, udf, _callback); + return registerUDFInfoCall(workspace, name, udf, _callback); } /** * * register a UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to register (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -774,14 +774,14 @@ private okhttp3.Call registerUDFInfoValidateBeforeCall(String namespace, String 0 error response - */ - public void registerUDFInfo(String namespace, String name, UDFInfoUpdate udf) throws ApiException { - registerUDFInfoWithHttpInfo(namespace, name, udf); + public void registerUDFInfo(String workspace, String name, UDFInfoUpdate udf) throws ApiException { + registerUDFInfoWithHttpInfo(workspace, name, udf); } /** * * register a UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to register (required) * @return ApiResponse<Void> @@ -794,15 +794,15 @@ public void registerUDFInfo(String namespace, String name, UDFInfoUpdate udf) th 0 error response - */ - public ApiResponse registerUDFInfoWithHttpInfo(String namespace, String name, UDFInfoUpdate udf) throws ApiException { - okhttp3.Call localVarCall = registerUDFInfoValidateBeforeCall(namespace, name, udf, null); + public ApiResponse registerUDFInfoWithHttpInfo(String workspace, String name, UDFInfoUpdate udf) throws ApiException { + okhttp3.Call localVarCall = registerUDFInfoValidateBeforeCall(workspace, name, udf, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * register a UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to register (required) * @param _callback The callback to be executed when the API call finishes @@ -816,15 +816,15 @@ public ApiResponse registerUDFInfoWithHttpInfo(String namespace, String na 0 error response - */ - public okhttp3.Call registerUDFInfoAsync(String namespace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { + public okhttp3.Call registerUDFInfoAsync(String workspace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = registerUDFInfoValidateBeforeCall(namespace, name, udf, _callback); + okhttp3.Call localVarCall = registerUDFInfoValidateBeforeCall(workspace, name, udf, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for shareUDFInfo - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udfSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @param _callback Callback for upload/download progress @@ -839,7 +839,7 @@ public okhttp3.Call registerUDFInfoAsync(String namespace, String name, UDFInfoU 0 error response - */ - public okhttp3.Call shareUDFInfoCall(String namespace, String name, UDFSharing udfSharing, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareUDFInfoCall(String workspace, String name, UDFSharing udfSharing, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -856,8 +856,8 @@ public okhttp3.Call shareUDFInfoCall(String namespace, String name, UDFSharing u Object localVarPostBody = udfSharing; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}/share" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}/share" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -887,10 +887,10 @@ public okhttp3.Call shareUDFInfoCall(String namespace, String name, UDFSharing u } @SuppressWarnings("rawtypes") - private okhttp3.Call shareUDFInfoValidateBeforeCall(String namespace, String name, UDFSharing udfSharing, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling shareUDFInfo(Async)"); + private okhttp3.Call shareUDFInfoValidateBeforeCall(String workspace, String name, UDFSharing udfSharing, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling shareUDFInfo(Async)"); } // verify the required parameter 'name' is set @@ -903,14 +903,14 @@ private okhttp3.Call shareUDFInfoValidateBeforeCall(String namespace, String nam throw new ApiException("Missing the required parameter 'udfSharing' when calling shareUDFInfo(Async)"); } - return shareUDFInfoCall(namespace, name, udfSharing, _callback); + return shareUDFInfoCall(workspace, name, udfSharing, _callback); } /** * * Share a UDF with a user - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udfSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -923,14 +923,14 @@ private okhttp3.Call shareUDFInfoValidateBeforeCall(String namespace, String nam 0 error response - */ - public void shareUDFInfo(String namespace, String name, UDFSharing udfSharing) throws ApiException { - shareUDFInfoWithHttpInfo(namespace, name, udfSharing); + public void shareUDFInfo(String workspace, String name, UDFSharing udfSharing) throws ApiException { + shareUDFInfoWithHttpInfo(workspace, name, udfSharing); } /** * * Share a UDF with a user - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udfSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @return ApiResponse<Void> @@ -944,15 +944,15 @@ public void shareUDFInfo(String namespace, String name, UDFSharing udfSharing) t 0 error response - */ - public ApiResponse shareUDFInfoWithHttpInfo(String namespace, String name, UDFSharing udfSharing) throws ApiException { - okhttp3.Call localVarCall = shareUDFInfoValidateBeforeCall(namespace, name, udfSharing, null); + public ApiResponse shareUDFInfoWithHttpInfo(String workspace, String name, UDFSharing udfSharing) throws ApiException { + okhttp3.Call localVarCall = shareUDFInfoValidateBeforeCall(workspace, name, udfSharing, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Share a UDF with a user - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name of UDFInfo (required) * @param udfSharing Namespace and list of permissions to share with. An empty list of permissions will remove the namespace; if permissions already exist they will be deleted then new ones added. In the event of a failure, the new policies will be rolled back to prevent partial policies, and it's likely the UDF will not be shared with the namespace at all. (required) * @param _callback The callback to be executed when the API call finishes @@ -967,15 +967,15 @@ public ApiResponse shareUDFInfoWithHttpInfo(String namespace, String name, 0 error response - */ - public okhttp3.Call shareUDFInfoAsync(String namespace, String name, UDFSharing udfSharing, final ApiCallback _callback) throws ApiException { + public okhttp3.Call shareUDFInfoAsync(String workspace, String name, UDFSharing udfSharing, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = shareUDFInfoValidateBeforeCall(namespace, name, udfSharing, _callback); + okhttp3.Call localVarCall = shareUDFInfoValidateBeforeCall(workspace, name, udfSharing, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } /** * Build call for submitGenericUDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @param _callback Callback for upload/download progress @@ -989,7 +989,7 @@ public okhttp3.Call shareUDFInfoAsync(String namespace, String name, UDFSharing 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public okhttp3.Call submitGenericUDFCall(String namespace, GenericUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitGenericUDFCall(String workspace, GenericUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1006,8 +1006,8 @@ public okhttp3.Call submitGenericUDFCall(String namespace, GenericUDF udf, Strin Object localVarPostBody = udf; // create path and map variables - String localVarPath = "/udfs/generic/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/udfs/generic/{workspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -1040,10 +1040,10 @@ public okhttp3.Call submitGenericUDFCall(String namespace, GenericUDF udf, Strin } @SuppressWarnings("rawtypes") - private okhttp3.Call submitGenericUDFValidateBeforeCall(String namespace, GenericUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitGenericUDF(Async)"); + private okhttp3.Call submitGenericUDFValidateBeforeCall(String workspace, GenericUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitGenericUDF(Async)"); } // verify the required parameter 'udf' is set @@ -1051,14 +1051,14 @@ private okhttp3.Call submitGenericUDFValidateBeforeCall(String namespace, Generi throw new ApiException("Missing the required parameter 'udf' when calling submitGenericUDF(Async)"); } - return submitGenericUDFCall(namespace, udf, acceptEncoding, _callback); + return submitGenericUDFCall(workspace, udf, acceptEncoding, _callback); } /** * * submit a generic UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @return File @@ -1071,15 +1071,15 @@ private okhttp3.Call submitGenericUDFValidateBeforeCall(String namespace, Generi 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public File submitGenericUDF(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitGenericUDFWithHttpInfo(namespace, udf, acceptEncoding); + public File submitGenericUDF(String workspace, GenericUDF udf, String acceptEncoding) throws ApiException { + ApiResponse localVarResp = submitGenericUDFWithHttpInfo(workspace, udf, acceptEncoding); return localVarResp.getData(); } /** * * submit a generic UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @return ApiResponse<File> @@ -1092,8 +1092,8 @@ public File submitGenericUDF(String namespace, GenericUDF udf, String acceptEnco 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public ApiResponse submitGenericUDFWithHttpInfo(String namespace, GenericUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + public ApiResponse submitGenericUDFWithHttpInfo(String workspace, GenericUDF udf, String acceptEncoding) throws ApiException { + okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(workspace, udf, acceptEncoding, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1101,7 +1101,7 @@ public ApiResponse submitGenericUDFWithHttpInfo(String namespace, GenericU /** * (asynchronously) * submit a generic UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @param _callback The callback to be executed when the API call finishes @@ -1115,16 +1115,16 @@ public ApiResponse submitGenericUDFWithHttpInfo(String namespace, GenericU 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public okhttp3.Call submitGenericUDFAsync(String namespace, GenericUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitGenericUDFAsync(String workspace, GenericUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(namespace, udf, acceptEncoding, _callback); + okhttp3.Call localVarCall = submitGenericUDFValidateBeforeCall(workspace, udf, acceptEncoding, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for submitMultiArrayUDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @param _callback Callback for upload/download progress @@ -1138,7 +1138,7 @@ public okhttp3.Call submitGenericUDFAsync(String namespace, GenericUDF udf, Stri 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public okhttp3.Call submitMultiArrayUDFCall(String namespace, MultiArrayUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitMultiArrayUDFCall(String workspace, MultiArrayUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1155,8 +1155,8 @@ public okhttp3.Call submitMultiArrayUDFCall(String namespace, MultiArrayUDF udf, Object localVarPostBody = udf; // create path and map variables - String localVarPath = "/udfs/arrays/{namespace}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/udfs/arrays/{workspace}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -1189,10 +1189,10 @@ public okhttp3.Call submitMultiArrayUDFCall(String namespace, MultiArrayUDF udf, } @SuppressWarnings("rawtypes") - private okhttp3.Call submitMultiArrayUDFValidateBeforeCall(String namespace, MultiArrayUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitMultiArrayUDF(Async)"); + private okhttp3.Call submitMultiArrayUDFValidateBeforeCall(String workspace, MultiArrayUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitMultiArrayUDF(Async)"); } // verify the required parameter 'udf' is set @@ -1200,14 +1200,14 @@ private okhttp3.Call submitMultiArrayUDFValidateBeforeCall(String namespace, Mul throw new ApiException("Missing the required parameter 'udf' when calling submitMultiArrayUDF(Async)"); } - return submitMultiArrayUDFCall(namespace, udf, acceptEncoding, _callback); + return submitMultiArrayUDFCall(workspace, udf, acceptEncoding, _callback); } /** * * submit a multi-array UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @return File @@ -1220,15 +1220,15 @@ private okhttp3.Call submitMultiArrayUDFValidateBeforeCall(String namespace, Mul 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public File submitMultiArrayUDF(String namespace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { - ApiResponse localVarResp = submitMultiArrayUDFWithHttpInfo(namespace, udf, acceptEncoding); + public File submitMultiArrayUDF(String workspace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { + ApiResponse localVarResp = submitMultiArrayUDFWithHttpInfo(workspace, udf, acceptEncoding); return localVarResp.getData(); } /** * * submit a multi-array UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @return ApiResponse<File> @@ -1241,8 +1241,8 @@ public File submitMultiArrayUDF(String namespace, MultiArrayUDF udf, String acce 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public ApiResponse submitMultiArrayUDFWithHttpInfo(String namespace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { - okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(namespace, udf, acceptEncoding, null); + public ApiResponse submitMultiArrayUDFWithHttpInfo(String workspace, MultiArrayUDF udf, String acceptEncoding) throws ApiException { + okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(workspace, udf, acceptEncoding, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1250,7 +1250,7 @@ public ApiResponse submitMultiArrayUDFWithHttpInfo(String namespace, Multi /** * (asynchronously) * submit a multi-array UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param udf UDF to run (required) * @param acceptEncoding Encoding to use (optional) * @param _callback The callback to be executed when the API call finishes @@ -1264,16 +1264,17 @@ public ApiResponse submitMultiArrayUDFWithHttpInfo(String namespace, Multi 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public okhttp3.Call submitMultiArrayUDFAsync(String namespace, MultiArrayUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitMultiArrayUDFAsync(String workspace, MultiArrayUDF udf, String acceptEncoding, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(namespace, udf, acceptEncoding, _callback); + okhttp3.Call localVarCall = submitMultiArrayUDFValidateBeforeCall(workspace, udf, acceptEncoding, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for submitUDF - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param udf UDF to run (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -1290,7 +1291,7 @@ public okhttp3.Call submitMultiArrayUDFAsync(String namespace, MultiArrayUDF udf 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public okhttp3.Call submitUDFCall(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitUDFCall(String workspace, String teamspace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1307,8 +1308,9 @@ public okhttp3.Call submitUDFCall(String namespace, String array, MultiArrayUDF Object localVarPostBody = udf; // create path and map variables - String localVarPath = "/arrays/{namespace}/{array}/udf/submit" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/arrays/{workspace}/{teamspace}/{array}/udf/submit" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1350,10 +1352,15 @@ public okhttp3.Call submitUDFCall(String namespace, String array, MultiArrayUDF } @SuppressWarnings("rawtypes") - private okhttp3.Call submitUDFValidateBeforeCall(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling submitUDF(Async)"); + private okhttp3.Call submitUDFValidateBeforeCall(String workspace, String teamspace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling submitUDF(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling submitUDF(Async)"); } // verify the required parameter 'array' is set @@ -1366,14 +1373,15 @@ private okhttp3.Call submitUDFValidateBeforeCall(String namespace, String array, throw new ApiException("Missing the required parameter 'udf' when calling submitUDF(Async)"); } - return submitUDFCall(namespace, array, udf, xPayer, acceptEncoding, v2, _callback); + return submitUDFCall(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2, _callback); } /** * * send a UDF to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param udf UDF to run (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -1389,15 +1397,16 @@ private okhttp3.Call submitUDFValidateBeforeCall(String namespace, String array, 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public File submitUDF(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - ApiResponse localVarResp = submitUDFWithHttpInfo(namespace, array, udf, xPayer, acceptEncoding, v2); + public File submitUDF(String workspace, String teamspace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + ApiResponse localVarResp = submitUDFWithHttpInfo(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2); return localVarResp.getData(); } /** * * send a UDF to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param udf UDF to run (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -1413,8 +1422,8 @@ public File submitUDF(String namespace, String array, MultiArrayUDF udf, String 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public ApiResponse submitUDFWithHttpInfo(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - okhttp3.Call localVarCall = submitUDFValidateBeforeCall(namespace, array, udf, xPayer, acceptEncoding, v2, null); + public ApiResponse submitUDFWithHttpInfo(String workspace, String teamspace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + okhttp3.Call localVarCall = submitUDFValidateBeforeCall(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1422,7 +1431,8 @@ public ApiResponse submitUDFWithHttpInfo(String namespace, String array, M /** * (asynchronously) * send a UDF to run against a specified array/URI registered to a group/project - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param udf UDF to run (required) * @param xPayer Name of organization or user who should be charged for this request (optional) @@ -1439,16 +1449,16 @@ public ApiResponse submitUDFWithHttpInfo(String namespace, String array, M 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public okhttp3.Call submitUDFAsync(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2, final ApiCallback _callback) throws ApiException { + public okhttp3.Call submitUDFAsync(String workspace, String teamspace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = submitUDFValidateBeforeCall(namespace, array, udf, xPayer, acceptEncoding, v2, _callback); + okhttp3.Call localVarCall = submitUDFValidateBeforeCall(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** - * Build call for udfNamespaceArrayEndTimestampsGet - * @param namespace namespace array is in (an organization name or user's username) (required) + * Build call for udfWorkspaceArrayEndTimestampsGet + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1463,7 +1473,7 @@ public okhttp3.Call submitUDFAsync(String namespace, String array, MultiArrayUDF 0 error response - */ - public okhttp3.Call udfNamespaceArrayEndTimestampsGetCall(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call udfWorkspaceArrayEndTimestampsGetCall(String workspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1480,8 +1490,8 @@ public okhttp3.Call udfNamespaceArrayEndTimestampsGetCall(String namespace, Stri Object localVarPostBody = null; // create path and map variables - String localVarPath = "/udf/{namespace}/{array}/end_timestamps" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{array}/end_timestamps" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "array" + "}", localVarApiClient.escapeString(array.toString())); List localVarQueryParams = new ArrayList(); @@ -1518,25 +1528,25 @@ public okhttp3.Call udfNamespaceArrayEndTimestampsGetCall(String namespace, Stri } @SuppressWarnings("rawtypes") - private okhttp3.Call udfNamespaceArrayEndTimestampsGetValidateBeforeCall(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling udfNamespaceArrayEndTimestampsGet(Async)"); + private okhttp3.Call udfWorkspaceArrayEndTimestampsGetValidateBeforeCall(String workspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling udfWorkspaceArrayEndTimestampsGet(Async)"); } // verify the required parameter 'array' is set if (array == null) { - throw new ApiException("Missing the required parameter 'array' when calling udfNamespaceArrayEndTimestampsGet(Async)"); + throw new ApiException("Missing the required parameter 'array' when calling udfWorkspaceArrayEndTimestampsGet(Async)"); } - return udfNamespaceArrayEndTimestampsGetCall(namespace, array, page, perPage, _callback); + return udfWorkspaceArrayEndTimestampsGetCall(workspace, array, page, perPage, _callback); } /** * * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1550,15 +1560,15 @@ private okhttp3.Call udfNamespaceArrayEndTimestampsGetValidateBeforeCall(String 0 error response - */ - public ArrayEndTimestampData udfNamespaceArrayEndTimestampsGet(String namespace, String array, Integer page, Integer perPage) throws ApiException { - ApiResponse localVarResp = udfNamespaceArrayEndTimestampsGetWithHttpInfo(namespace, array, page, perPage); + public ArrayEndTimestampData udfWorkspaceArrayEndTimestampsGet(String workspace, String array, Integer page, Integer perPage) throws ApiException { + ApiResponse localVarResp = udfWorkspaceArrayEndTimestampsGetWithHttpInfo(workspace, array, page, perPage); return localVarResp.getData(); } /** * * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1572,8 +1582,8 @@ public ArrayEndTimestampData udfNamespaceArrayEndTimestampsGet(String namespace, 0 error response - */ - public ApiResponse udfNamespaceArrayEndTimestampsGetWithHttpInfo(String namespace, String array, Integer page, Integer perPage) throws ApiException { - okhttp3.Call localVarCall = udfNamespaceArrayEndTimestampsGetValidateBeforeCall(namespace, array, page, perPage, null); + public ApiResponse udfWorkspaceArrayEndTimestampsGetWithHttpInfo(String workspace, String array, Integer page, Integer perPage) throws ApiException { + okhttp3.Call localVarCall = udfWorkspaceArrayEndTimestampsGetValidateBeforeCall(workspace, array, page, perPage, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1581,7 +1591,7 @@ public ApiResponse udfNamespaceArrayEndTimestampsGetWithH /** * (asynchronously) * retrieve a list of timestamps from the array fragment info listing in milliseconds, paginated - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param array name/uri of array that is url-encoded (required) * @param page pagination offset (optional) * @param perPage pagination limit (optional) @@ -1596,16 +1606,16 @@ public ApiResponse udfNamespaceArrayEndTimestampsGetWithH 0 error response - */ - public okhttp3.Call udfNamespaceArrayEndTimestampsGetAsync(String namespace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { + public okhttp3.Call udfWorkspaceArrayEndTimestampsGetAsync(String workspace, String array, Integer page, Integer perPage, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = udfNamespaceArrayEndTimestampsGetValidateBeforeCall(namespace, array, page, perPage, _callback); + okhttp3.Call localVarCall = udfWorkspaceArrayEndTimestampsGetValidateBeforeCall(workspace, array, page, perPage, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for updateUDFInfo - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to update (required) * @param _callback Callback for upload/download progress @@ -1619,7 +1629,7 @@ public okhttp3.Call udfNamespaceArrayEndTimestampsGetAsync(String namespace, Str 0 error response - */ - public okhttp3.Call updateUDFInfoCall(String namespace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateUDFInfoCall(String workspace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1636,8 +1646,8 @@ public okhttp3.Call updateUDFInfoCall(String namespace, String name, UDFInfoUpda Object localVarPostBody = udf; // create path and map variables - String localVarPath = "/udf/{namespace}/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/udf/{workspace}/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -1667,10 +1677,10 @@ public okhttp3.Call updateUDFInfoCall(String namespace, String name, UDFInfoUpda } @SuppressWarnings("rawtypes") - private okhttp3.Call updateUDFInfoValidateBeforeCall(String namespace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateUDFInfo(Async)"); + private okhttp3.Call updateUDFInfoValidateBeforeCall(String workspace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateUDFInfo(Async)"); } // verify the required parameter 'name' is set @@ -1683,14 +1693,14 @@ private okhttp3.Call updateUDFInfoValidateBeforeCall(String namespace, String na throw new ApiException("Missing the required parameter 'udf' when calling updateUDFInfo(Async)"); } - return updateUDFInfoCall(namespace, name, udf, _callback); + return updateUDFInfoCall(workspace, name, udf, _callback); } /** * * update an existing registered UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to update (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -1702,14 +1712,14 @@ private okhttp3.Call updateUDFInfoValidateBeforeCall(String namespace, String na 0 error response - */ - public void updateUDFInfo(String namespace, String name, UDFInfoUpdate udf) throws ApiException { - updateUDFInfoWithHttpInfo(namespace, name, udf); + public void updateUDFInfo(String workspace, String name, UDFInfoUpdate udf) throws ApiException { + updateUDFInfoWithHttpInfo(workspace, name, udf); } /** * * update an existing registered UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to update (required) * @return ApiResponse<Void> @@ -1722,15 +1732,15 @@ public void updateUDFInfo(String namespace, String name, UDFInfoUpdate udf) thro 0 error response - */ - public ApiResponse updateUDFInfoWithHttpInfo(String namespace, String name, UDFInfoUpdate udf) throws ApiException { - okhttp3.Call localVarCall = updateUDFInfoValidateBeforeCall(namespace, name, udf, null); + public ApiResponse updateUDFInfoWithHttpInfo(String workspace, String name, UDFInfoUpdate udf) throws ApiException { + okhttp3.Call localVarCall = updateUDFInfoValidateBeforeCall(workspace, name, udf, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * update an existing registered UDF in the given namespace - * @param namespace namespace array is in (an organization name or user's username) (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) * @param name name to register UDF under (required) * @param udf UDF to update (required) * @param _callback The callback to be executed when the API call finishes @@ -1744,9 +1754,9 @@ public ApiResponse updateUDFInfoWithHttpInfo(String namespace, String name 0 error response - */ - public okhttp3.Call updateUDFInfoAsync(String namespace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateUDFInfoAsync(String workspace, String name, UDFInfoUpdate udf, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateUDFInfoValidateBeforeCall(namespace, name, udf, _callback); + okhttp3.Call localVarCall = updateUDFInfoValidateBeforeCall(workspace, name, udf, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } @@ -1974,8 +1984,8 @@ public ApiResponse submitMultiArrayUDFWithHttpInfoBytes(String namespace 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public String submitUDFString(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - ApiResponse localVarResp = submitUDFWithHttpInfoString(namespace, array, udf, xPayer, acceptEncoding, v2); + public String submitUDFString(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + ApiResponse localVarResp = submitUDFWithHttpInfoString(workspace, namespace, array, udf, xPayer, acceptEncoding, v2); return localVarResp.getData(); } @@ -1997,8 +2007,8 @@ public String submitUDFString(String namespace, String array, MultiArrayUDF udf, 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public ApiResponse submitUDFWithHttpInfoString(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - okhttp3.Call localVarCall = submitUDFValidateBeforeCall(namespace, array, udf, xPayer, acceptEncoding, v2, null); + public ApiResponse submitUDFWithHttpInfoString(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + okhttp3.Call localVarCall = submitUDFValidateBeforeCall(workspace, namespace, array, udf, xPayer, acceptEncoding, v2, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -2021,8 +2031,8 @@ public ApiResponse submitUDFWithHttpInfoString(String namespace, String 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public byte[] submitUDFBytes(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - ApiResponse localVarResp = submitUDFWithHttpInfoBytes(namespace, array, udf, xPayer, acceptEncoding, v2); + public byte[] submitUDFBytes(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + ApiResponse localVarResp = submitUDFWithHttpInfoBytes(workspace, namespace, array, udf, xPayer, acceptEncoding, v2); return localVarResp.getData(); } @@ -2044,8 +2054,8 @@ public byte[] submitUDFBytes(String namespace, String array, MultiArrayUDF udf, 0 error response * X-TILEDB-CLOUD-TASK-ID - Task ID for just completed request
*/ - public ApiResponse submitUDFWithHttpInfoBytes(String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { - okhttp3.Call localVarCall = submitUDFValidateBeforeCall(namespace, array, udf, xPayer, acceptEncoding, v2, null); + public ApiResponse submitUDFWithHttpInfoBytes(String workspace, String namespace, String array, MultiArrayUDF udf, String xPayer, String acceptEncoding, String v2) throws ApiException { + okhttp3.Call localVarCall = submitUDFValidateBeforeCall(workspace, namespace, array, udf, xPayer, acceptEncoding, v2, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } diff --git a/src/main/java/io/tiledb/cloud/rest_api/api/UserApi.java b/src/main/java/io/tiledb/cloud/rest_api/api/UserApi.java index 829c985..fc844c5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/api/UserApi.java +++ b/src/main/java/io/tiledb/cloud/rest_api/api/UserApi.java @@ -29,6 +29,7 @@ import io.tiledb.cloud.rest_api.model.AWSAccessCredentials; import io.tiledb.cloud.rest_api.model.Error; +import java.time.OffsetDateTime; import io.tiledb.cloud.rest_api.model.OrganizationUser; import io.tiledb.cloud.rest_api.model.ResetUserPasswordRequest; import io.tiledb.cloud.rest_api.model.Token; @@ -81,7 +82,8 @@ public void setCustomBaseUrl(String customBaseUrl) { /** * Build call for addAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -94,7 +96,7 @@ public void setCustomBaseUrl(String customBaseUrl) { 0 error response - */ - public okhttp3.Call addAWSAccessCredentialsCall(String namespace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addAWSAccessCredentialsCall(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -111,8 +113,9 @@ public okhttp3.Call addAWSAccessCredentialsCall(String namespace, AWSAccessCrede Object localVarPostBody = awsAccessCredentials; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/credentials/{workspace}/{teamspace}/aws" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -141,10 +144,15 @@ public okhttp3.Call addAWSAccessCredentialsCall(String namespace, AWSAccessCrede } @SuppressWarnings("rawtypes") - private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String namespace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling addAWSAccessCredentials(Async)"); + private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling addAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling addAWSAccessCredentials(Async)"); } // verify the required parameter 'awsAccessCredentials' is set @@ -152,14 +160,15 @@ private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String namespace, throw new ApiException("Missing the required parameter 'awsAccessCredentials' when calling addAWSAccessCredentials(Async)"); } - return addAWSAccessCredentialsCall(namespace, awsAccessCredentials, _callback); + return addAWSAccessCredentialsCall(workspace, teamspace, awsAccessCredentials, _callback); } /** * * Add aws keys - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -170,14 +179,15 @@ private okhttp3.Call addAWSAccessCredentialsValidateBeforeCall(String namespace, 0 error response - */ - public void addAWSAccessCredentials(String namespace, AWSAccessCredentials awsAccessCredentials) throws ApiException { - addAWSAccessCredentialsWithHttpInfo(namespace, awsAccessCredentials); + public void addAWSAccessCredentials(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials) throws ApiException { + addAWSAccessCredentialsWithHttpInfo(workspace, teamspace, awsAccessCredentials); } /** * * Add aws keys - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -189,15 +199,16 @@ public void addAWSAccessCredentials(String namespace, AWSAccessCredentials awsAc 0 error response - */ - public ApiResponse addAWSAccessCredentialsWithHttpInfo(String namespace, AWSAccessCredentials awsAccessCredentials) throws ApiException { - okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(namespace, awsAccessCredentials, null); + public ApiResponse addAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials) throws ApiException { + okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, awsAccessCredentials, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Add aws keys - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param awsAccessCredentials aws access credentials to store for a namespace (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -210,9 +221,9 @@ public ApiResponse addAWSAccessCredentialsWithHttpInfo(String namespace, A 0 error response - */ - public okhttp3.Call addAWSAccessCredentialsAsync(String namespace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call addAWSAccessCredentialsAsync(String workspace, String teamspace, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(namespace, awsAccessCredentials, _callback); + okhttp3.Call localVarCall = addAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, awsAccessCredentials, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } @@ -355,7 +366,8 @@ public okhttp3.Call addUserToOrganizationAsync(String organization, Organization } /** * Build call for checkAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -367,7 +379,7 @@ public okhttp3.Call addUserToOrganizationAsync(String organization, Organization 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsCall(String namespace, final ApiCallback _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -384,8 +396,9 @@ public okhttp3.Call checkAWSAccessCredentialsCall(String namespace, final ApiCal Object localVarPostBody = null; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())); + String localVarPath = "/credentials/{workspace}/{teamspace}/aws" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())); List localVarQueryParams = new ArrayList(); List localVarCollectionQueryParams = new ArrayList(); @@ -413,20 +426,26 @@ public okhttp3.Call checkAWSAccessCredentialsCall(String namespace, final ApiCal } @SuppressWarnings("rawtypes") - private okhttp3.Call checkAWSAccessCredentialsValidateBeforeCall(String namespace, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling checkAWSAccessCredentials(Async)"); + private okhttp3.Call checkAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling checkAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling checkAWSAccessCredentials(Async)"); } - return checkAWSAccessCredentialsCall(namespace, _callback); + return checkAWSAccessCredentialsCall(workspace, teamspace, _callback); } /** * * Check if aws keys are set - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @return List<AWSAccessCredentials> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -437,15 +456,16 @@ private okhttp3.Call checkAWSAccessCredentialsValidateBeforeCall(String namespac 0 error response - */ - public List checkAWSAccessCredentials(String namespace) throws ApiException { - ApiResponse> localVarResp = checkAWSAccessCredentialsWithHttpInfo(namespace); + public List checkAWSAccessCredentials(String workspace, String teamspace) throws ApiException { + ApiResponse> localVarResp = checkAWSAccessCredentialsWithHttpInfo(workspace, teamspace); return localVarResp.getData(); } /** * * Check if aws keys are set - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @return ApiResponse<List<AWSAccessCredentials>> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -456,8 +476,8 @@ public List checkAWSAccessCredentials(String namespace) th 0 error response - */ - public ApiResponse> checkAWSAccessCredentialsWithHttpInfo(String namespace) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(namespace, null); + public ApiResponse> checkAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace) throws ApiException { + okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, null); Type localVarReturnType = new TypeToken>(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -465,7 +485,8 @@ public ApiResponse> checkAWSAccessCredentialsWithHttp /** * (asynchronously) * Check if aws keys are set - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -477,16 +498,17 @@ public ApiResponse> checkAWSAccessCredentialsWithHttp 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsAsync(String namespace, final ApiCallback> _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsAsync(String workspace, String teamspace, final ApiCallback> _callback) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(namespace, _callback); + okhttp3.Call localVarCall = checkAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, _callback); Type localVarReturnType = new TypeToken>(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; } /** * Build call for checkAWSAccessCredentialsByName - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -499,7 +521,7 @@ public okhttp3.Call checkAWSAccessCredentialsAsync(String namespace, final ApiCa 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsByNameCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsByNameCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -516,8 +538,9 @@ public okhttp3.Call checkAWSAccessCredentialsByNameCall(String namespace, String Object localVarPostBody = null; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/credentials/{workspace}/{teamspace}/aws/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -546,10 +569,15 @@ public okhttp3.Call checkAWSAccessCredentialsByNameCall(String namespace, String } @SuppressWarnings("rawtypes") - private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling checkAWSAccessCredentialsByName(Async)"); + private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling checkAWSAccessCredentialsByName(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling checkAWSAccessCredentialsByName(Async)"); } // verify the required parameter 'name' is set @@ -557,14 +585,15 @@ private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String na throw new ApiException("Missing the required parameter 'name' when calling checkAWSAccessCredentialsByName(Async)"); } - return checkAWSAccessCredentialsByNameCall(namespace, name, _callback); + return checkAWSAccessCredentialsByNameCall(workspace, teamspace, name, _callback); } /** * * Check if aws keys are set by name - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @return AWSAccessCredentials * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -576,15 +605,16 @@ private okhttp3.Call checkAWSAccessCredentialsByNameValidateBeforeCall(String na 0 error response - */ - public AWSAccessCredentials checkAWSAccessCredentialsByName(String namespace, String name) throws ApiException { - ApiResponse localVarResp = checkAWSAccessCredentialsByNameWithHttpInfo(namespace, name); + public AWSAccessCredentials checkAWSAccessCredentialsByName(String workspace, String teamspace, String name) throws ApiException { + ApiResponse localVarResp = checkAWSAccessCredentialsByNameWithHttpInfo(workspace, teamspace, name); return localVarResp.getData(); } /** * * Check if aws keys are set by name - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @return ApiResponse<AWSAccessCredentials> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -596,8 +626,8 @@ public AWSAccessCredentials checkAWSAccessCredentialsByName(String namespace, St 0 error response - */ - public ApiResponse checkAWSAccessCredentialsByNameWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(namespace, name, null); + public ApiResponse checkAWSAccessCredentialsByNameWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(workspace, teamspace, name, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -605,7 +635,8 @@ public ApiResponse checkAWSAccessCredentialsByNameWithHttp /** * (asynchronously) * Check if aws keys are set by name - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -618,9 +649,9 @@ public ApiResponse checkAWSAccessCredentialsByNameWithHttp 0 error response - */ - public okhttp3.Call checkAWSAccessCredentialsByNameAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call checkAWSAccessCredentialsByNameAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = checkAWSAccessCredentialsByNameValidateBeforeCall(workspace, teamspace, name, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -871,7 +902,8 @@ public okhttp3.Call createUserAsync(User user, final ApiCallback _callback } /** * Build call for deleteAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback Callback for upload/download progress * @return Call to execute @@ -884,7 +916,7 @@ public okhttp3.Call createUserAsync(User user, final ApiCallback _callback 0 error response - */ - public okhttp3.Call deleteAWSAccessCredentialsCall(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteAWSAccessCredentialsCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -901,8 +933,9 @@ public okhttp3.Call deleteAWSAccessCredentialsCall(String namespace, String name Object localVarPostBody = null; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/credentials/{workspace}/{teamspace}/aws/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -931,10 +964,15 @@ public okhttp3.Call deleteAWSAccessCredentialsCall(String namespace, String name } @SuppressWarnings("rawtypes") - private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String namespace, String name, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling deleteAWSAccessCredentials(Async)"); + private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling deleteAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling deleteAWSAccessCredentials(Async)"); } // verify the required parameter 'name' is set @@ -942,14 +980,15 @@ private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String namespa throw new ApiException("Missing the required parameter 'name' when calling deleteAWSAccessCredentials(Async)"); } - return deleteAWSAccessCredentialsCall(namespace, name, _callback); + return deleteAWSAccessCredentialsCall(workspace, teamspace, name, _callback); } /** * * delete a AWS Access credentials in a namespace. This will likely cause arrays to become unreachable - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -960,14 +999,15 @@ private okhttp3.Call deleteAWSAccessCredentialsValidateBeforeCall(String namespa 0 error response - */ - public void deleteAWSAccessCredentials(String namespace, String name) throws ApiException { - deleteAWSAccessCredentialsWithHttpInfo(namespace, name); + public void deleteAWSAccessCredentials(String workspace, String teamspace, String name) throws ApiException { + deleteAWSAccessCredentialsWithHttpInfo(workspace, teamspace, name); } /** * * delete a AWS Access credentials in a namespace. This will likely cause arrays to become unreachable - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @return ApiResponse<Void> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -979,15 +1019,16 @@ public void deleteAWSAccessCredentials(String namespace, String name) throws Api 0 error response - */ - public ApiResponse deleteAWSAccessCredentialsWithHttpInfo(String namespace, String name) throws ApiException { - okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(namespace, name, null); + public ApiResponse deleteAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace, String name) throws ApiException { + okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * delete a AWS Access credentials in a namespace. This will likely cause arrays to become unreachable - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param _callback The callback to be executed when the API call finishes * @return The request call @@ -1000,9 +1041,9 @@ public ApiResponse deleteAWSAccessCredentialsWithHttpInfo(String namespace 0 error response - */ - public okhttp3.Call deleteAWSAccessCredentialsAsync(String namespace, String name, final ApiCallback _callback) throws ApiException { + public okhttp3.Call deleteAWSAccessCredentialsAsync(String workspace, String teamspace, String name, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(namespace, name, _callback); + okhttp3.Call localVarCall = deleteAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } @@ -1418,6 +1459,7 @@ public okhttp3.Call getOrganizationUserAsync(String organization, String usernam /** * Build call for getSession * @param rememberMe flag to create a token with expiration of 30 days, default is false (optional) + * @param expires Expiration date for token, if empty token defaults to 30 minutes (optional) * @param _callback Callback for upload/download progress * @return Call to execute * @throws ApiException If fail to serialize the request body object @@ -1429,7 +1471,7 @@ public okhttp3.Call getOrganizationUserAsync(String organization, String usernam 0 error response - */ - public okhttp3.Call getSessionCall(String rememberMe, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getSessionCall(String rememberMe, OffsetDateTime expires, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -1458,6 +1500,10 @@ public okhttp3.Call getSessionCall(String rememberMe, final ApiCallback _callbac localVarQueryParams.addAll(localVarApiClient.parameterToPair("remember_me", rememberMe)); } + if (expires != null) { + localVarQueryParams.addAll(localVarApiClient.parameterToPair("expires", expires)); + } + final String[] localVarAccepts = { "application/json" }; @@ -1478,8 +1524,8 @@ public okhttp3.Call getSessionCall(String rememberMe, final ApiCallback _callbac } @SuppressWarnings("rawtypes") - private okhttp3.Call getSessionValidateBeforeCall(String rememberMe, final ApiCallback _callback) throws ApiException { - return getSessionCall(rememberMe, _callback); + private okhttp3.Call getSessionValidateBeforeCall(String rememberMe, OffsetDateTime expires, final ApiCallback _callback) throws ApiException { + return getSessionCall(rememberMe, expires, _callback); } @@ -1487,6 +1533,7 @@ private okhttp3.Call getSessionValidateBeforeCall(String rememberMe, final ApiCa * * Get session token for user * @param rememberMe flag to create a token with expiration of 30 days, default is false (optional) + * @param expires Expiration date for token, if empty token defaults to 30 minutes (optional) * @return Token * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1497,8 +1544,8 @@ private okhttp3.Call getSessionValidateBeforeCall(String rememberMe, final ApiCa 0 error response - */ - public Token getSession(String rememberMe) throws ApiException { - ApiResponse localVarResp = getSessionWithHttpInfo(rememberMe); + public Token getSession(String rememberMe, OffsetDateTime expires) throws ApiException { + ApiResponse localVarResp = getSessionWithHttpInfo(rememberMe, expires); return localVarResp.getData(); } @@ -1506,6 +1553,7 @@ public Token getSession(String rememberMe) throws ApiException { * * Get session token for user * @param rememberMe flag to create a token with expiration of 30 days, default is false (optional) + * @param expires Expiration date for token, if empty token defaults to 30 minutes (optional) * @return ApiResponse<Token> * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body * @http.response.details @@ -1516,8 +1564,8 @@ public Token getSession(String rememberMe) throws ApiException { 0 error response - */ - public ApiResponse getSessionWithHttpInfo(String rememberMe) throws ApiException { - okhttp3.Call localVarCall = getSessionValidateBeforeCall(rememberMe, null); + public ApiResponse getSessionWithHttpInfo(String rememberMe, OffsetDateTime expires) throws ApiException { + okhttp3.Call localVarCall = getSessionValidateBeforeCall(rememberMe, expires, null); Type localVarReturnType = new TypeToken(){}.getType(); return localVarApiClient.execute(localVarCall, localVarReturnType); } @@ -1526,6 +1574,7 @@ public ApiResponse getSessionWithHttpInfo(String rememberMe) throws ApiEx * (asynchronously) * Get session token for user * @param rememberMe flag to create a token with expiration of 30 days, default is false (optional) + * @param expires Expiration date for token, if empty token defaults to 30 minutes (optional) * @param _callback The callback to be executed when the API call finishes * @return The request call * @throws ApiException If fail to process the API call, e.g. serializing the request body object @@ -1537,9 +1586,9 @@ public ApiResponse getSessionWithHttpInfo(String rememberMe) throws ApiEx 0 error response - */ - public okhttp3.Call getSessionAsync(String rememberMe, final ApiCallback _callback) throws ApiException { + public okhttp3.Call getSessionAsync(String rememberMe, OffsetDateTime expires, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = getSessionValidateBeforeCall(rememberMe, _callback); + okhttp3.Call localVarCall = getSessionValidateBeforeCall(rememberMe, expires, _callback); Type localVarReturnType = new TypeToken(){}.getType(); localVarApiClient.executeAsync(localVarCall, localVarReturnType, _callback); return localVarCall; @@ -2549,7 +2598,8 @@ public okhttp3.Call tokensSessionGetAsync(final ApiCallback> _callba } /** * Build call for updateAWSAccessCredentials - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @param _callback Callback for upload/download progress @@ -2563,7 +2613,7 @@ public okhttp3.Call tokensSessionGetAsync(final ApiCallback> _callba 0 error response - */ - public okhttp3.Call updateAWSAccessCredentialsCall(String namespace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateAWSAccessCredentialsCall(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { String basePath = null; // Operation Servers String[] localBasePaths = new String[] { }; @@ -2580,8 +2630,9 @@ public okhttp3.Call updateAWSAccessCredentialsCall(String namespace, String name Object localVarPostBody = awsAccessCredentials; // create path and map variables - String localVarPath = "/credentials/{namespace}/aws/{name}" - .replace("{" + "namespace" + "}", localVarApiClient.escapeString(namespace.toString())) + String localVarPath = "/credentials/{workspace}/{teamspace}/aws/{name}" + .replace("{" + "workspace" + "}", localVarApiClient.escapeString(workspace.toString())) + .replace("{" + "teamspace" + "}", localVarApiClient.escapeString(teamspace.toString())) .replace("{" + "name" + "}", localVarApiClient.escapeString(name.toString())); List localVarQueryParams = new ArrayList(); @@ -2611,10 +2662,15 @@ public okhttp3.Call updateAWSAccessCredentialsCall(String namespace, String name } @SuppressWarnings("rawtypes") - private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String namespace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - // verify the required parameter 'namespace' is set - if (namespace == null) { - throw new ApiException("Missing the required parameter 'namespace' when calling updateAWSAccessCredentials(Async)"); + private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + // verify the required parameter 'workspace' is set + if (workspace == null) { + throw new ApiException("Missing the required parameter 'workspace' when calling updateAWSAccessCredentials(Async)"); + } + + // verify the required parameter 'teamspace' is set + if (teamspace == null) { + throw new ApiException("Missing the required parameter 'teamspace' when calling updateAWSAccessCredentials(Async)"); } // verify the required parameter 'name' is set @@ -2627,14 +2683,15 @@ private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String namespa throw new ApiException("Missing the required parameter 'awsAccessCredentials' when calling updateAWSAccessCredentials(Async)"); } - return updateAWSAccessCredentialsCall(namespace, name, awsAccessCredentials, _callback); + return updateAWSAccessCredentialsCall(workspace, teamspace, name, awsAccessCredentials, _callback); } /** * * Update aws keys or associated buckets. This will update the key associations for each array in the namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body @@ -2646,14 +2703,15 @@ private okhttp3.Call updateAWSAccessCredentialsValidateBeforeCall(String namespa 0 error response - */ - public void updateAWSAccessCredentials(String namespace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { - updateAWSAccessCredentialsWithHttpInfo(namespace, name, awsAccessCredentials); + public void updateAWSAccessCredentials(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { + updateAWSAccessCredentialsWithHttpInfo(workspace, teamspace, name, awsAccessCredentials); } /** * * Update aws keys or associated buckets. This will update the key associations for each array in the namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @return ApiResponse<Void> @@ -2666,15 +2724,16 @@ public void updateAWSAccessCredentials(String namespace, String name, AWSAccessC 0 error response - */ - public ApiResponse updateAWSAccessCredentialsWithHttpInfo(String namespace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { - okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(namespace, name, awsAccessCredentials, null); + public ApiResponse updateAWSAccessCredentialsWithHttpInfo(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials) throws ApiException { + okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, awsAccessCredentials, null); return localVarApiClient.execute(localVarCall); } /** * (asynchronously) * Update aws keys or associated buckets. This will update the key associations for each array in the namespace - * @param namespace namespace (required) + * @param workspace the workspace containing the teamspace the array belongs to (required) + * @param teamspace the teamspace the credentials belongs to (required) * @param name name (required) * @param awsAccessCredentials aws credentials to update (required) * @param _callback The callback to be executed when the API call finishes @@ -2688,9 +2747,9 @@ public ApiResponse updateAWSAccessCredentialsWithHttpInfo(String namespace 0 error response - */ - public okhttp3.Call updateAWSAccessCredentialsAsync(String namespace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { + public okhttp3.Call updateAWSAccessCredentialsAsync(String workspace, String teamspace, String name, AWSAccessCredentials awsAccessCredentials, final ApiCallback _callback) throws ApiException { - okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(namespace, name, awsAccessCredentials, _callback); + okhttp3.Call localVarCall = updateAWSAccessCredentialsValidateBeforeCall(workspace, teamspace, name, awsAccessCredentials, _callback); localVarApiClient.executeAsync(localVarCall, _callback); return localVarCall; } diff --git a/src/main/java/io/tiledb/cloud/rest_api/auth/ApiKeyAuth.java b/src/main/java/io/tiledb/cloud/rest_api/auth/ApiKeyAuth.java index e32026b..627b54c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/auth/ApiKeyAuth.java +++ b/src/main/java/io/tiledb/cloud/rest_api/auth/ApiKeyAuth.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ApiKeyAuth implements Authentication { private final String location; private final String paramName; diff --git a/src/main/java/io/tiledb/cloud/rest_api/auth/HttpBearerAuth.java b/src/main/java/io/tiledb/cloud/rest_api/auth/HttpBearerAuth.java index 7ee8914..46f32ff 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/auth/HttpBearerAuth.java +++ b/src/main/java/io/tiledb/cloud/rest_api/auth/HttpBearerAuth.java @@ -22,7 +22,7 @@ import java.util.Optional; import java.util.function.Supplier; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class HttpBearerAuth implements Authentication { private final String scheme; private Supplier tokenSupplier; diff --git a/src/main/java/io/tiledb/cloud/rest_api/auth/OAuth.java b/src/main/java/io/tiledb/cloud/rest_api/auth/OAuth.java index be06af4..a103a4c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/auth/OAuth.java +++ b/src/main/java/io/tiledb/cloud/rest_api/auth/OAuth.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.List; -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class OAuth implements Authentication { private String accessToken; diff --git a/src/main/java/io/tiledb/cloud/rest_api/auth/OAuthFlow.java b/src/main/java/io/tiledb/cloud/rest_api/auth/OAuthFlow.java index b826d7d..32dc3fb 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/auth/OAuthFlow.java +++ b/src/main/java/io/tiledb/cloud/rest_api/auth/OAuthFlow.java @@ -16,7 +16,7 @@ /** * OAuth flows that are supported by this client */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public enum OAuthFlow { ACCESS_CODE, //called authorizationCode in OpenAPI 3.0 IMPLICIT, diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AWSAccessCredentials.java b/src/main/java/io/tiledb/cloud/rest_api/model/AWSAccessCredentials.java index 42621e9..34e71ca 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AWSAccessCredentials.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AWSAccessCredentials.java @@ -52,7 +52,7 @@ /** * Model representing aws keys or service role, service roles are currently ignored, but will be preferred option in the future */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class AWSAccessCredentials { public static final String SERIALIZED_NAME_SECRET_ACCESS_KEY = "secret_access_key"; @SerializedName(SERIALIZED_NAME_SECRET_ACCESS_KEY) @@ -241,50 +241,6 @@ public OffsetDateTime getUpdatedAt() { } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the AWSAccessCredentials instance itself - */ - public AWSAccessCredentials putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -303,13 +259,12 @@ public boolean equals(Object o) { Objects.equals(this._default, awSAccessCredentials._default) && Objects.equals(this.buckets, awSAccessCredentials.buckets) && Objects.equals(this.createdAt, awSAccessCredentials.createdAt) && - Objects.equals(this.updatedAt, awSAccessCredentials.updatedAt)&& - Objects.equals(this.additionalProperties, awSAccessCredentials.additionalProperties); + Objects.equals(this.updatedAt, awSAccessCredentials.updatedAt); } @Override public int hashCode() { - return Objects.hash(secretAccessKey, accessKeyId, serviceRoleArn, name, _default, buckets, createdAt, updatedAt, additionalProperties); + return Objects.hash(secretAccessKey, accessKeyId, serviceRoleArn, name, _default, buckets, createdAt, updatedAt); } @Override @@ -324,7 +279,6 @@ public String toString() { sb.append(" buckets: ").append(toIndentedString(buckets)).append("\n"); sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" updatedAt: ").append(toIndentedString(updatedAt)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -372,23 +326,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in AWSAccessCredentials is not found in the empty JSON string", AWSAccessCredentials.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("secret_access_key") != null && !jsonObj.get("secret_access_key").isJsonNull()) && !jsonObj.get("secret_access_key").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `secret_access_key` to be a primitive type in the JSON string but got `%s`", jsonObj.get("secret_access_key").toString())); - } - if ((jsonObj.get("access_key_id") != null && !jsonObj.get("access_key_id").isJsonNull()) && !jsonObj.get("access_key_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `access_key_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("access_key_id").toString())); - } - if ((jsonObj.get("service_role_arn") != null && !jsonObj.get("service_role_arn").isJsonNull()) && !jsonObj.get("service_role_arn").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `service_role_arn` to be a primitive type in the JSON string but got `%s`", jsonObj.get("service_role_arn").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("buckets") != null && !jsonObj.get("buckets").isJsonNull() && !jsonObj.get("buckets").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `buckets` to be an array in the JSON string but got `%s`", jsonObj.get("buckets").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -406,28 +343,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, AWSAccessCredentials value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -435,28 +350,7 @@ else if (entry.getValue() instanceof Character) public AWSAccessCredentials read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - AWSAccessCredentials instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AbstractOpenApiSchema.java b/src/main/java/io/tiledb/cloud/rest_api/model/AbstractOpenApiSchema.java index 49769f1..7cb0532 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AbstractOpenApiSchema.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AbstractOpenApiSchema.java @@ -21,7 +21,7 @@ /** * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public abstract class AbstractOpenApiSchema { // store the actual instance of the schema/object diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ActivityEventType.java b/src/main/java/io/tiledb/cloud/rest_api/model/ActivityEventType.java index 8573205..e1a957a 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ActivityEventType.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ActivityEventType.java @@ -59,7 +59,9 @@ public enum ActivityEventType { READ_FRAGMENT_INFO("read_fragment_info"), - READ_ENUMERATIONS("read_enumerations"); + READ_ENUMERATIONS("read_enumerations"), + + NEXTFLOW("nextflow"); private String value; diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Array.java b/src/main/java/io/tiledb/cloud/rest_api/model/Array.java index a9af199..984822f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Array.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Array.java @@ -51,7 +51,7 @@ /** * Represents an open array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Array { public static final String SERIALIZED_NAME_TIMESTAMP = "timestamp"; @SerializedName(SERIALIZED_NAME_TIMESTAMP) @@ -124,50 +124,6 @@ public void setUri(String uri) { this.uri = uri; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Array instance itself - */ - public Array putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -181,13 +137,12 @@ public boolean equals(Object o) { Array array = (Array) o; return Objects.equals(this.timestamp, array.timestamp) && Objects.equals(this.queryType, array.queryType) && - Objects.equals(this.uri, array.uri)&& - Objects.equals(this.additionalProperties, array.additionalProperties); + Objects.equals(this.uri, array.uri); } @Override public int hashCode() { - return Objects.hash(timestamp, queryType, uri, additionalProperties); + return Objects.hash(timestamp, queryType, uri); } @Override @@ -197,7 +152,6 @@ public String toString() { sb.append(" timestamp: ").append(toIndentedString(timestamp)).append("\n"); sb.append(" queryType: ").append(toIndentedString(queryType)).append("\n"); sb.append(" uri: ").append(toIndentedString(uri)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -244,6 +198,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Array.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Array` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : Array.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -273,28 +235,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Array value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -302,28 +242,7 @@ else if (entry.getValue() instanceof Character) public Array read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Array instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayActivityLog.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayActivityLog.java index 098a6ee..279f077 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayActivityLog.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayActivityLog.java @@ -51,7 +51,7 @@ /** * Actvity of an Array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayActivityLog { public static final String SERIALIZED_NAME_EVENT_AT = "event_at"; @SerializedName(SERIALIZED_NAME_EVENT_AT) @@ -262,50 +262,6 @@ public void setQueryStats(String queryStats) { this.queryStats = queryStats; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayActivityLog instance itself - */ - public ArrayActivityLog putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -325,13 +281,12 @@ public boolean equals(Object o) { Objects.equals(this.arrayTaskId, arrayActivityLog.arrayTaskId) && Objects.equals(this.id, arrayActivityLog.id) && Objects.equals(this.queryRanges, arrayActivityLog.queryRanges) && - Objects.equals(this.queryStats, arrayActivityLog.queryStats)&& - Objects.equals(this.additionalProperties, arrayActivityLog.additionalProperties); + Objects.equals(this.queryStats, arrayActivityLog.queryStats); } @Override public int hashCode() { - return Objects.hash(eventAt, action, username, bytesSent, bytesReceived, arrayTaskId, id, queryRanges, queryStats, additionalProperties); + return Objects.hash(eventAt, action, username, bytesSent, bytesReceived, arrayTaskId, id, queryRanges, queryStats); } @Override @@ -347,7 +302,6 @@ public String toString() { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" queryRanges: ").append(toIndentedString(queryRanges)).append("\n"); sb.append(" queryStats: ").append(toIndentedString(queryStats)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -384,37 +338,6 @@ private String toIndentedString(Object o) { openapiRequiredFields = new HashSet(); } - /** - * Validates the JSON Object and throws an exception if issues found - * - * @param jsonObj JSON Object - * @throws IOException if the JSON Object is invalid with respect to ArrayActivityLog - */ - public static void validateJsonObject(JsonObject jsonObj) throws IOException { - if (jsonObj == null) { - if (ArrayActivityLog.openapiRequiredFields.isEmpty()) { - return; - } else { // has required fields - throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayActivityLog is not found in the empty JSON string", ArrayActivityLog.openapiRequiredFields.toString())); - } - } - if (jsonObj.get("username") != null && !jsonObj.get("username").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); - } - if (jsonObj.get("array_task_id") != null && !jsonObj.get("array_task_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `array_task_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("array_task_id").toString())); - } - if (jsonObj.get("id") != null && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if (jsonObj.get("query_ranges") != null && !jsonObj.get("query_ranges").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `query_ranges` to be a primitive type in the JSON string but got `%s`", jsonObj.get("query_ranges").toString())); - } - if (jsonObj.get("query_stats") != null && !jsonObj.get("query_stats").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `query_stats` to be a primitive type in the JSON string but got `%s`", jsonObj.get("query_stats").toString())); - } - } - /** * Validates the JSON Element and throws an exception if issues found * @@ -427,26 +350,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayActivityLog is not found in the empty JSON string", ArrayActivityLog.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `action` - if (jsonObj.get("action") != null && !jsonObj.get("action").isJsonNull()) { - ActivityEventType.validateJsonElement(jsonObj.get("action")); - } - if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); - } - if ((jsonObj.get("array_task_id") != null && !jsonObj.get("array_task_id").isJsonNull()) && !jsonObj.get("array_task_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `array_task_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("array_task_id").toString())); - } - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if ((jsonObj.get("query_ranges") != null && !jsonObj.get("query_ranges").isJsonNull()) && !jsonObj.get("query_ranges").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `query_ranges` to be a primitive type in the JSON string but got `%s`", jsonObj.get("query_ranges").toString())); - } - if ((jsonObj.get("query_stats") != null && !jsonObj.get("query_stats").isJsonNull()) && !jsonObj.get("query_stats").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `query_stats` to be a primitive type in the JSON string but got `%s`", jsonObj.get("query_stats").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -464,28 +367,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayActivityLog value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -493,28 +374,7 @@ else if (entry.getValue() instanceof Character) public ArrayActivityLog read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayActivityLog instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserData.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserData.java index 6733bbc..0b4195e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserData.java @@ -53,7 +53,7 @@ /** * Object including array info and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayBrowserData { public static final String SERIALIZED_NAME_ARRAYS = "arrays"; @SerializedName(SERIALIZED_NAME_ARRAYS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayBrowserData instance itself - */ - public ArrayBrowserData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } ArrayBrowserData arrayBrowserData = (ArrayBrowserData) o; return Objects.equals(this.arrays, arrayBrowserData.arrays) && - Objects.equals(this.paginationMetadata, arrayBrowserData.paginationMetadata)&& - Objects.equals(this.additionalProperties, arrayBrowserData.additionalProperties); + Objects.equals(this.paginationMetadata, arrayBrowserData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(arrays, paginationMetadata, additionalProperties); + return Objects.hash(arrays, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class ArrayBrowserData {\n"); sb.append(" arrays: ").append(toIndentedString(arrays)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayBrowserData is not found in the empty JSON string", ArrayBrowserData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayBrowserData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayBrowserData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("arrays") != null && !jsonObj.get("arrays").isJsonNull()) { JsonArray jsonArrayarrays = jsonObj.getAsJsonArray("arrays"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayBrowserData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public ArrayBrowserData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayBrowserData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserSidebar.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserSidebar.java index 2fe35b3..199d5c2 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserSidebar.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayBrowserSidebar.java @@ -51,7 +51,7 @@ /** * Object for ui array tasks browser page */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayBrowserSidebar { public static final String SERIALIZED_NAME_NAMESPACES = "namespaces"; @SerializedName(SERIALIZED_NAME_NAMESPACES) @@ -132,50 +132,6 @@ public void setResultCountByNamespace(Object resultCountByNamespace) { this.resultCountByNamespace = resultCountByNamespace; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayBrowserSidebar instance itself - */ - public ArrayBrowserSidebar putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -189,13 +145,12 @@ public boolean equals(Object o) { ArrayBrowserSidebar arrayBrowserSidebar = (ArrayBrowserSidebar) o; return Objects.equals(this.namespaces, arrayBrowserSidebar.namespaces) && Objects.equals(this.resultCountForAll, arrayBrowserSidebar.resultCountForAll) && - Objects.equals(this.resultCountByNamespace, arrayBrowserSidebar.resultCountByNamespace)&& - Objects.equals(this.additionalProperties, arrayBrowserSidebar.additionalProperties); + Objects.equals(this.resultCountByNamespace, arrayBrowserSidebar.resultCountByNamespace); } @Override public int hashCode() { - return Objects.hash(namespaces, resultCountForAll, resultCountByNamespace, additionalProperties); + return Objects.hash(namespaces, resultCountForAll, resultCountByNamespace); } @Override @@ -205,7 +160,6 @@ public String toString() { sb.append(" namespaces: ").append(toIndentedString(namespaces)).append("\n"); sb.append(" resultCountForAll: ").append(toIndentedString(resultCountForAll)).append("\n"); sb.append(" resultCountByNamespace: ").append(toIndentedString(resultCountByNamespace)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -248,6 +202,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayBrowserSidebar is not found in the empty JSON string", ArrayBrowserSidebar.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayBrowserSidebar.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayBrowserSidebar` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("namespaces") != null && !jsonObj.get("namespaces").isJsonNull() && !jsonObj.get("namespaces").isJsonArray()) { @@ -270,28 +232,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayBrowserSidebar value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -299,28 +239,7 @@ else if (entry.getValue() instanceof Character) public ArrayBrowserSidebar read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayBrowserSidebar instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayConsolidationRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayConsolidationRequest.java index f492694..efc479d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayConsolidationRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayConsolidationRequest.java @@ -52,7 +52,7 @@ /** * Request to consolidate an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayConsolidationRequest { public static final String SERIALIZED_NAME_CONFIG = "config"; @SerializedName(SERIALIZED_NAME_CONFIG) @@ -110,50 +110,6 @@ public void setFragments(List fragments) { this.fragments = fragments; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayConsolidationRequest instance itself - */ - public ArrayConsolidationRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -166,13 +122,12 @@ public boolean equals(Object o) { } ArrayConsolidationRequest arrayConsolidationRequest = (ArrayConsolidationRequest) o; return Objects.equals(this.config, arrayConsolidationRequest.config) && - Objects.equals(this.fragments, arrayConsolidationRequest.fragments)&& - Objects.equals(this.additionalProperties, arrayConsolidationRequest.additionalProperties); + Objects.equals(this.fragments, arrayConsolidationRequest.fragments); } @Override public int hashCode() { - return Objects.hash(config, fragments, additionalProperties); + return Objects.hash(config, fragments); } @Override @@ -181,7 +136,6 @@ public String toString() { sb.append("class ArrayConsolidationRequest {\n"); sb.append(" config: ").append(toIndentedString(config)).append("\n"); sb.append(" fragments: ").append(toIndentedString(fragments)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -223,15 +177,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayConsolidationRequest is not found in the empty JSON string", ArrayConsolidationRequest.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `config` - if (jsonObj.get("config") != null && !jsonObj.get("config").isJsonNull()) { - TileDBConfig.validateJsonElement(jsonObj.get("config")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("fragments") != null && !jsonObj.get("fragments").isJsonNull() && !jsonObj.get("fragments").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `fragments` to be an array in the JSON string but got `%s`", jsonObj.get("fragments").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -249,28 +194,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayConsolidationRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -278,28 +201,7 @@ else if (entry.getValue() instanceof Character) public ArrayConsolidationRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayConsolidationRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayEndTimestampData.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayEndTimestampData.java index de322f0..1cef671 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayEndTimestampData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayEndTimestampData.java @@ -52,7 +52,7 @@ /** * Object including array end_timestamps (list of Unix epoch timestamps in milliseconds) and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayEndTimestampData { public static final String SERIALIZED_NAME_END_TIMESTAMPS = "end_timestamps"; @SerializedName(SERIALIZED_NAME_END_TIMESTAMPS) @@ -110,50 +110,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayEndTimestampData instance itself - */ - public ArrayEndTimestampData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -166,13 +122,12 @@ public boolean equals(Object o) { } ArrayEndTimestampData arrayEndTimestampData = (ArrayEndTimestampData) o; return Objects.equals(this.endTimestamps, arrayEndTimestampData.endTimestamps) && - Objects.equals(this.paginationMetadata, arrayEndTimestampData.paginationMetadata)&& - Objects.equals(this.additionalProperties, arrayEndTimestampData.additionalProperties); + Objects.equals(this.paginationMetadata, arrayEndTimestampData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(endTimestamps, paginationMetadata, additionalProperties); + return Objects.hash(endTimestamps, paginationMetadata); } @Override @@ -181,7 +136,6 @@ public String toString() { sb.append("class ArrayEndTimestampData {\n"); sb.append(" endTimestamps: ").append(toIndentedString(endTimestamps)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -223,6 +177,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayEndTimestampData is not found in the empty JSON string", ArrayEndTimestampData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayEndTimestampData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayEndTimestampData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("end_timestamps") != null && !jsonObj.get("end_timestamps").isJsonNull() && !jsonObj.get("end_timestamps").isJsonArray()) { @@ -249,28 +211,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayEndTimestampData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -278,28 +218,7 @@ else if (entry.getValue() instanceof Character) public ArrayEndTimestampData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayEndTimestampData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavorite.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavorite.java index 6074007..7ee0e2b 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavorite.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavorite.java @@ -49,7 +49,7 @@ /** * A user-favorite array item */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayFavorite { public static final String SERIALIZED_NAME_ARRAY_UUID = "array_uuid"; @SerializedName(SERIALIZED_NAME_ARRAY_UUID) @@ -122,50 +122,6 @@ public void setName(String name) { this.name = name; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayFavorite instance itself - */ - public ArrayFavorite putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { ArrayFavorite arrayFavorite = (ArrayFavorite) o; return Objects.equals(this.arrayUuid, arrayFavorite.arrayUuid) && Objects.equals(this.namespace, arrayFavorite.namespace) && - Objects.equals(this.name, arrayFavorite.name)&& - Objects.equals(this.additionalProperties, arrayFavorite.additionalProperties); + Objects.equals(this.name, arrayFavorite.name); } @Override public int hashCode() { - return Objects.hash(arrayUuid, namespace, name, additionalProperties); + return Objects.hash(arrayUuid, namespace, name); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" arrayUuid: ").append(toIndentedString(arrayUuid)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayFavorite is not found in the empty JSON string", ArrayFavorite.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayFavorite.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayFavorite` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("array_uuid") != null && !jsonObj.get("array_uuid").isJsonNull()) && !jsonObj.get("array_uuid").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `array_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("array_uuid").toString())); @@ -265,28 +227,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayFavorite value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +234,7 @@ else if (entry.getValue() instanceof Character) public ArrayFavorite read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayFavorite instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavoritesData.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavoritesData.java index d44a0d3..13cd29d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavoritesData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayFavoritesData.java @@ -53,7 +53,7 @@ /** * Object including array favorites and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayFavoritesData { public static final String SERIALIZED_NAME_ARRAYS = "arrays"; @SerializedName(SERIALIZED_NAME_ARRAYS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayFavoritesData instance itself - */ - public ArrayFavoritesData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } ArrayFavoritesData arrayFavoritesData = (ArrayFavoritesData) o; return Objects.equals(this.arrays, arrayFavoritesData.arrays) && - Objects.equals(this.paginationMetadata, arrayFavoritesData.paginationMetadata)&& - Objects.equals(this.additionalProperties, arrayFavoritesData.additionalProperties); + Objects.equals(this.paginationMetadata, arrayFavoritesData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(arrays, paginationMetadata, additionalProperties); + return Objects.hash(arrays, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class ArrayFavoritesData {\n"); sb.append(" arrays: ").append(toIndentedString(arrays)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,25 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayFavoritesData is not found in the empty JSON string", ArrayFavoritesData.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("arrays") != null && !jsonObj.get("arrays").isJsonNull()) { - JsonArray jsonArrayarrays = jsonObj.getAsJsonArray("arrays"); - if (jsonArrayarrays != null) { - // ensure the json data is an array - if (!jsonObj.get("arrays").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `arrays` to be an array in the JSON string but got `%s`", jsonObj.get("arrays").toString())); - } - - // validate the optional field `arrays` (array) - for (int i = 0; i < jsonArrayarrays.size(); i++) { - ArrayInfo.validateJsonElement(jsonArrayarrays.get(i)); - }; - } - } - // validate the optional field `pagination_metadata` - if (jsonObj.get("pagination_metadata") != null && !jsonObj.get("pagination_metadata").isJsonNull()) { - PaginationMetadata.validateJsonElement(jsonObj.get("pagination_metadata")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -260,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayFavoritesData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +202,7 @@ else if (entry.getValue() instanceof Character) public ArrayFavoritesData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayFavoritesData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfo.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfo.java index c5b0c45..a8f779c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfo.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfo.java @@ -62,12 +62,16 @@ /** * metadata of an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayInfo { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) private String id; + public static final String SERIALIZED_NAME_ASSET_ID = "asset_id"; + @SerializedName(SERIALIZED_NAME_ASSET_ID) + private String assetId; + public static final String SERIALIZED_NAME_FILE_TYPE = "file_type"; @SerializedName(SERIALIZED_NAME_FILE_TYPE) private FileType fileType; @@ -201,6 +205,25 @@ public void setId(String id) { } + public ArrayInfo assetId(String assetId) { + this.assetId = assetId; + return this; + } + + /** + * The asset id of the created array + * @return assetId + */ + @javax.annotation.Nullable + public String getAssetId() { + return assetId; + } + + public void setAssetId(String assetId) { + this.assetId = assetId; + } + + public ArrayInfo fileType(FileType fileType) { this.fileType = fileType; return this; @@ -734,50 +757,6 @@ public void setMetadata(List metadata) { this.metadata = metadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayInfo instance itself - */ - public ArrayInfo putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -790,6 +769,7 @@ public boolean equals(Object o) { } ArrayInfo arrayInfo = (ArrayInfo) o; return Objects.equals(this.id, arrayInfo.id) && + Objects.equals(this.assetId, arrayInfo.assetId) && Objects.equals(this.fileType, arrayInfo.fileType) && Objects.equals(this.fileProperties, arrayInfo.fileProperties) && Objects.equals(this.uri, arrayInfo.uri) && @@ -815,8 +795,7 @@ public boolean equals(Object o) { Objects.equals(this.isFavorite, arrayInfo.isFavorite) && Objects.equals(this.createdAt, arrayInfo.createdAt) && Objects.equals(this.createdBy, arrayInfo.createdBy) && - Objects.equals(this.metadata, arrayInfo.metadata)&& - Objects.equals(this.additionalProperties, arrayInfo.additionalProperties); + Objects.equals(this.metadata, arrayInfo.metadata); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -825,7 +804,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, fileType, fileProperties, uri, namespace, size, lastAccessed, description, name, allowedActions, pricing, subscriptions, logo, accessCredentialsName, type, shareCount, publicShare, namespaceSubscribed, tiledbUri, tags, licenseId, licenseText, readOnly, isFavorite, createdAt, createdBy, metadata, additionalProperties); + return Objects.hash(id, assetId, fileType, fileProperties, uri, namespace, size, lastAccessed, description, name, allowedActions, pricing, subscriptions, logo, accessCredentialsName, type, shareCount, publicShare, namespaceSubscribed, tiledbUri, tags, licenseId, licenseText, readOnly, isFavorite, createdAt, createdBy, metadata); } private static int hashCodeNullable(JsonNullable a) { @@ -840,6 +819,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ArrayInfo {\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" assetId: ").append(toIndentedString(assetId)).append("\n"); sb.append(" fileType: ").append(toIndentedString(fileType)).append("\n"); sb.append(" fileProperties: ").append(toIndentedString(fileProperties)).append("\n"); sb.append(" uri: ").append(toIndentedString(uri)).append("\n"); @@ -866,7 +846,6 @@ public String toString() { sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" createdBy: ").append(toIndentedString(createdBy)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -890,6 +869,7 @@ private String toIndentedString(Object o) { // a set of all properties/fields (JSON key names) openapiFields = new HashSet(); openapiFields.add("id"); + openapiFields.add("asset_id"); openapiFields.add("file_type"); openapiFields.add("file_properties"); openapiFields.add("uri"); @@ -933,10 +913,21 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayInfo is not found in the empty JSON string", ArrayInfo.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayInfo.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayInfo` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); } + if ((jsonObj.get("asset_id") != null && !jsonObj.get("asset_id").isJsonNull()) && !jsonObj.get("asset_id").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `asset_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("asset_id").toString())); + } // validate the optional field `file_type` if (jsonObj.get("file_type") != null && !jsonObj.get("file_type").isJsonNull()) { FileType.validateJsonElement(jsonObj.get("file_type")); @@ -1042,28 +1033,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayInfo value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -1071,28 +1040,7 @@ else if (entry.getValue() instanceof Character) public ArrayInfo read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayInfo instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfoUpdate.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfoUpdate.java index e730e88..f64c74d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfoUpdate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayInfoUpdate.java @@ -55,7 +55,7 @@ /** * metadata of an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayInfoUpdate { public static final String SERIALIZED_NAME_DESCRIPTION = "description"; @SerializedName(SERIALIZED_NAME_DESCRIPTION) @@ -328,50 +328,6 @@ public void setReadOnly(Boolean readOnly) { this.readOnly = readOnly; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayInfoUpdate instance itself - */ - public ArrayInfoUpdate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -393,8 +349,7 @@ public boolean equals(Object o) { Objects.equals(this.tags, arrayInfoUpdate.tags) && Objects.equals(this.licenseId, arrayInfoUpdate.licenseId) && Objects.equals(this.licenseText, arrayInfoUpdate.licenseText) && - Objects.equals(this.readOnly, arrayInfoUpdate.readOnly)&& - Objects.equals(this.additionalProperties, arrayInfoUpdate.additionalProperties); + Objects.equals(this.readOnly, arrayInfoUpdate.readOnly); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -403,7 +358,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(description, name, uri, fileType, fileProperties, accessCredentialsName, logo, tags, licenseId, licenseText, readOnly, additionalProperties); + return Objects.hash(description, name, uri, fileType, fileProperties, accessCredentialsName, logo, tags, licenseId, licenseText, readOnly); } private static int hashCodeNullable(JsonNullable a) { @@ -428,7 +383,6 @@ public String toString() { sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n"); sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); sb.append(" readOnly: ").append(toIndentedString(readOnly)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -479,36 +433,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayInfoUpdate is not found in the empty JSON string", ArrayInfoUpdate.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("description") != null && !jsonObj.get("description").isJsonNull()) && !jsonObj.get("description").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("uri") != null && !jsonObj.get("uri").isJsonNull()) && !jsonObj.get("uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uri").toString())); - } - // validate the optional field `file_type` - if (jsonObj.get("file_type") != null && !jsonObj.get("file_type").isJsonNull()) { - FileType.validateJsonElement(jsonObj.get("file_type")); - } - if ((jsonObj.get("access_credentials_name") != null && !jsonObj.get("access_credentials_name").isJsonNull()) && !jsonObj.get("access_credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `access_credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("access_credentials_name").toString())); - } - if ((jsonObj.get("logo") != null && !jsonObj.get("logo").isJsonNull()) && !jsonObj.get("logo").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logo` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logo").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("tags") != null && !jsonObj.get("tags").isJsonNull() && !jsonObj.get("tags").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `tags` to be an array in the JSON string but got `%s`", jsonObj.get("tags").toString())); - } - if ((jsonObj.get("license_id") != null && !jsonObj.get("license_id").isJsonNull()) && !jsonObj.get("license_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_id").toString())); - } - if ((jsonObj.get("license_text") != null && !jsonObj.get("license_text").isJsonNull()) && !jsonObj.get("license_text").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_text` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_text").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -526,28 +450,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayInfoUpdate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -555,28 +457,7 @@ else if (entry.getValue() instanceof Character) public ArrayInfoUpdate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayInfoUpdate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadata.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadata.java index b3c286a..8869e35 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadata.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadata.java @@ -52,7 +52,7 @@ /** * user's TileDB array metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayMetadata { public static final String SERIALIZED_NAME_ENTRIES = "entries"; @SerializedName(SERIALIZED_NAME_ENTRIES) @@ -87,50 +87,6 @@ public void setEntries(List entries) { this.entries = entries; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayMetadata instance itself - */ - public ArrayMetadata putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } ArrayMetadata arrayMetadata = (ArrayMetadata) o; - return Objects.equals(this.entries, arrayMetadata.entries)&& - Objects.equals(this.additionalProperties, arrayMetadata.additionalProperties); + return Objects.equals(this.entries, arrayMetadata.entries); } @Override public int hashCode() { - return Objects.hash(entries, additionalProperties); + return Objects.hash(entries); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ArrayMetadata {\n"); sb.append(" entries: ").append(toIndentedString(entries)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayMetadata is not found in the empty JSON string", ArrayMetadata.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("entries") != null && !jsonObj.get("entries").isJsonNull()) { - JsonArray jsonArrayentries = jsonObj.getAsJsonArray("entries"); - if (jsonArrayentries != null) { - // ensure the json data is an array - if (!jsonObj.get("entries").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `entries` to be an array in the JSON string but got `%s`", jsonObj.get("entries").toString())); - } - - // validate the optional field `entries` (array) - for (int i = 0; i < jsonArrayentries.size(); i++) { - ArrayMetadataEntry.validateJsonElement(jsonArrayentries.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayMetadata value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public ArrayMetadata read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayMetadata instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadataEntry.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadataEntry.java index cc29788..d4f2bbc 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadataEntry.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayMetadataEntry.java @@ -51,7 +51,7 @@ /** * key/value pair representing an array metadata map entry */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayMetadataEntry { public static final String SERIALIZED_NAME_KEY = "key"; @SerializedName(SERIALIZED_NAME_KEY) @@ -178,50 +178,6 @@ public void setDel(Boolean del) { this.del = del; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayMetadataEntry instance itself - */ - public ArrayMetadataEntry putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -237,13 +193,12 @@ public boolean equals(Object o) { Objects.equals(this.type, arrayMetadataEntry.type) && Objects.equals(this.valueNum, arrayMetadataEntry.valueNum) && Objects.equals(this.value, arrayMetadataEntry.value) && - Objects.equals(this.del, arrayMetadataEntry.del)&& - Objects.equals(this.additionalProperties, arrayMetadataEntry.additionalProperties); + Objects.equals(this.del, arrayMetadataEntry.del); } @Override public int hashCode() { - return Objects.hash(key, type, valueNum, value, del, additionalProperties); + return Objects.hash(key, type, valueNum, value, del); } @Override @@ -255,7 +210,6 @@ public String toString() { sb.append(" valueNum: ").append(toIndentedString(valueNum)).append("\n"); sb.append(" value: ").append(toIndentedString(value)).append("\n"); sb.append(" del: ").append(toIndentedString(del)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -300,17 +254,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayMetadataEntry is not found in the empty JSON string", ArrayMetadataEntry.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("key") != null && !jsonObj.get("key").isJsonNull()) && !jsonObj.get("key").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `key` to be a primitive type in the JSON string but got `%s`", jsonObj.get("key").toString())); - } - if ((jsonObj.get("type") != null && !jsonObj.get("type").isJsonNull()) && !jsonObj.get("type").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `type` to be a primitive type in the JSON string but got `%s`", jsonObj.get("type").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("value") != null && !jsonObj.get("value").isJsonNull() && !jsonObj.get("value").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `value` to be an array in the JSON string but got `%s`", jsonObj.get("value").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -328,28 +271,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayMetadataEntry value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -357,28 +278,7 @@ else if (entry.getValue() instanceof Character) public ArrayMetadataEntry read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayMetadataEntry instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArraySample.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArraySample.java index 800642c..8edab91 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArraySample.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArraySample.java @@ -49,7 +49,7 @@ /** * Sample data from array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArraySample { public static final String SERIALIZED_NAME_DATA = "data"; @SerializedName(SERIALIZED_NAME_DATA) @@ -76,50 +76,6 @@ public void setData(Object data) { this.data = data; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArraySample instance itself - */ - public ArraySample putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -131,13 +87,12 @@ public boolean equals(Object o) { return false; } ArraySample arraySample = (ArraySample) o; - return Objects.equals(this.data, arraySample.data)&& - Objects.equals(this.additionalProperties, arraySample.additionalProperties); + return Objects.equals(this.data, arraySample.data); } @Override public int hashCode() { - return Objects.hash(data, additionalProperties); + return Objects.hash(data); } @Override @@ -145,7 +100,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ArraySample {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -186,7 +140,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArraySample is not found in the empty JSON string", ArraySample.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -204,28 +157,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArraySample value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -233,28 +164,7 @@ else if (entry.getValue() instanceof Character) public ArraySample read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArraySample instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArraySchema.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArraySchema.java index ce36e90..3b4316d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArraySchema.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArraySchema.java @@ -56,7 +56,7 @@ /** * ArraySchema during creation or retrieval */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArraySchema { public static final String SERIALIZED_NAME_URI = "uri"; @SerializedName(SERIALIZED_NAME_URI) @@ -329,50 +329,6 @@ public void setAllowsDuplicates(Boolean allowsDuplicates) { this.allowsDuplicates = allowsDuplicates; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArraySchema instance itself - */ - public ArraySchema putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -394,13 +350,12 @@ public boolean equals(Object o) { Objects.equals(this.offsetFilterPipeline, arraySchema.offsetFilterPipeline) && Objects.equals(this.domain, arraySchema.domain) && Objects.equals(this.attributes, arraySchema.attributes) && - Objects.equals(this.allowsDuplicates, arraySchema.allowsDuplicates)&& - Objects.equals(this.additionalProperties, arraySchema.additionalProperties); + Objects.equals(this.allowsDuplicates, arraySchema.allowsDuplicates); } @Override public int hashCode() { - return Objects.hash(uri, version, arrayType, tileOrder, cellOrder, capacity, coordsFilterPipeline, offsetFilterPipeline, domain, attributes, allowsDuplicates, additionalProperties); + return Objects.hash(uri, version, arrayType, tileOrder, cellOrder, capacity, coordsFilterPipeline, offsetFilterPipeline, domain, attributes, allowsDuplicates); } @Override @@ -418,7 +373,6 @@ public String toString() { sb.append(" domain: ").append(toIndentedString(domain)).append("\n"); sb.append(" attributes: ").append(toIndentedString(attributes)).append("\n"); sb.append(" allowsDuplicates: ").append(toIndentedString(allowsDuplicates)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -478,45 +432,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArraySchema is not found in the empty JSON string", ArraySchema.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : ArraySchema.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("uri") != null && !jsonObj.get("uri").isJsonNull()) && !jsonObj.get("uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uri").toString())); - } - // ensure the required json array is present - if (jsonObj.get("version") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("version").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `version` to be an array in the JSON string but got `%s`", jsonObj.get("version").toString())); - } - // validate the required field `arrayType` - ArrayType.validateJsonElement(jsonObj.get("arrayType")); - // validate the required field `tileOrder` - Layout.validateJsonElement(jsonObj.get("tileOrder")); - // validate the required field `cellOrder` - Layout.validateJsonElement(jsonObj.get("cellOrder")); - // validate the required field `coordsFilterPipeline` - FilterPipeline.validateJsonElement(jsonObj.get("coordsFilterPipeline")); - // validate the required field `offsetFilterPipeline` - FilterPipeline.validateJsonElement(jsonObj.get("offsetFilterPipeline")); - // validate the required field `domain` - Domain.validateJsonElement(jsonObj.get("domain")); - // ensure the json data is an array - if (!jsonObj.get("attributes").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `attributes` to be an array in the JSON string but got `%s`", jsonObj.get("attributes").toString())); - } - - JsonArray jsonArrayattributes = jsonObj.getAsJsonArray("attributes"); - // validate the required field `attributes` (array) - for (int i = 0; i < jsonArrayattributes.size(); i++) { - Attribute.validateJsonElement(jsonArrayattributes.get(i)); - }; } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -534,28 +449,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArraySchema value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -563,28 +456,7 @@ else if (entry.getValue() instanceof Character) public ArraySchema read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArraySchema instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArraySharing.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArraySharing.java index e6aad94..b8c207c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArraySharing.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArraySharing.java @@ -52,7 +52,7 @@ /** * details for sharing a given array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArraySharing { public static final String SERIALIZED_NAME_ACTIONS = "actions"; @SerializedName(SERIALIZED_NAME_ACTIONS) @@ -133,50 +133,6 @@ public void setNamespaceType(String namespaceType) { this.namespaceType = namespaceType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArraySharing instance itself - */ - public ArraySharing putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -190,13 +146,12 @@ public boolean equals(Object o) { ArraySharing arraySharing = (ArraySharing) o; return Objects.equals(this.actions, arraySharing.actions) && Objects.equals(this.namespace, arraySharing.namespace) && - Objects.equals(this.namespaceType, arraySharing.namespaceType)&& - Objects.equals(this.additionalProperties, arraySharing.additionalProperties); + Objects.equals(this.namespaceType, arraySharing.namespaceType); } @Override public int hashCode() { - return Objects.hash(actions, namespace, namespaceType, additionalProperties); + return Objects.hash(actions, namespace, namespaceType); } @Override @@ -206,7 +161,6 @@ public String toString() { sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" namespaceType: ").append(toIndentedString(namespaceType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -249,17 +203,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArraySharing is not found in the empty JSON string", ArraySharing.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the optional json data is an array if present - if (jsonObj.get("actions") != null && !jsonObj.get("actions").isJsonNull() && !jsonObj.get("actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `actions` to be an array in the JSON string but got `%s`", jsonObj.get("actions").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("namespace_type") != null && !jsonObj.get("namespace_type").isJsonNull()) && !jsonObj.get("namespace_type").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace_type` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace_type").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -277,28 +220,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArraySharing value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -306,28 +227,7 @@ else if (entry.getValue() instanceof Character) public ArraySharing read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArraySharing instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTask.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTask.java index a351330..4c7f7ff 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTask.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTask.java @@ -61,7 +61,7 @@ /** * Synchronous Task to Run */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayTask { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -802,50 +802,6 @@ public void setCloudRegion(String cloudRegion) { this.cloudRegion = cloudRegion; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayTask instance itself - */ - public ArrayTask putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -887,8 +843,7 @@ public boolean equals(Object o) { Objects.equals(this.taskGraphUuid, arrayTask.taskGraphUuid) && Objects.equals(this.clientNodeUuid, arrayTask.clientNodeUuid) && Objects.equals(this.cloudProvider, arrayTask.cloudProvider) && - Objects.equals(this.cloudRegion, arrayTask.cloudRegion)&& - Objects.equals(this.additionalProperties, arrayTask.additionalProperties); + Objects.equals(this.cloudRegion, arrayTask.cloudRegion); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -897,7 +852,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, name, username, description, arrayMetadata, subarray, memory, cpu, namespace, status, statusMessage, startTime, finishTime, cost, egressCost, accessCost, queryType, udfCode, udfLanguage, sqlQuery, type, activity, logs, duration, sqlInitCommands, sqlParameters, resultFormat, taskGraphUuid, clientNodeUuid, cloudProvider, cloudRegion, additionalProperties); + return Objects.hash(id, name, username, description, arrayMetadata, subarray, memory, cpu, namespace, status, statusMessage, startTime, finishTime, cost, egressCost, accessCost, queryType, udfCode, udfLanguage, sqlQuery, type, activity, logs, duration, sqlInitCommands, sqlParameters, resultFormat, taskGraphUuid, clientNodeUuid, cloudProvider, cloudRegion); } private static int hashCodeNullable(JsonNullable a) { @@ -942,7 +897,6 @@ public String toString() { sb.append(" clientNodeUuid: ").append(toIndentedString(clientNodeUuid)).append("\n"); sb.append(" cloudProvider: ").append(toIndentedString(cloudProvider)).append("\n"); sb.append(" cloudRegion: ").append(toIndentedString(cloudRegion)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -1013,95 +967,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayTask is not found in the empty JSON string", ArrayTask.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("username") != null && !jsonObj.get("username").isJsonNull()) && !jsonObj.get("username").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); - } - if ((jsonObj.get("description") != null && !jsonObj.get("description").isJsonNull()) && !jsonObj.get("description").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); - } - // validate the optional field `array_metadata` - if (jsonObj.get("array_metadata") != null && !jsonObj.get("array_metadata").isJsonNull()) { - ArrayInfo.validateJsonElement(jsonObj.get("array_metadata")); - } - // validate the optional field `subarray` - if (jsonObj.get("subarray") != null && !jsonObj.get("subarray").isJsonNull()) { - DomainArray.validateJsonElement(jsonObj.get("subarray")); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - // validate the optional field `status` - if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { - ArrayTaskStatus.validateJsonElement(jsonObj.get("status")); - } - if ((jsonObj.get("status_message") != null && !jsonObj.get("status_message").isJsonNull()) && !jsonObj.get("status_message").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `status_message` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status_message").toString())); - } - // validate the optional field `query_type` - if (jsonObj.get("query_type") != null && !jsonObj.get("query_type").isJsonNull()) { - Querytype.validateJsonElement(jsonObj.get("query_type")); - } - if ((jsonObj.get("udf_code") != null && !jsonObj.get("udf_code").isJsonNull()) && !jsonObj.get("udf_code").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `udf_code` to be a primitive type in the JSON string but got `%s`", jsonObj.get("udf_code").toString())); - } - if ((jsonObj.get("udf_language") != null && !jsonObj.get("udf_language").isJsonNull()) && !jsonObj.get("udf_language").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `udf_language` to be a primitive type in the JSON string but got `%s`", jsonObj.get("udf_language").toString())); - } - if ((jsonObj.get("sql_query") != null && !jsonObj.get("sql_query").isJsonNull()) && !jsonObj.get("sql_query").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `sql_query` to be a primitive type in the JSON string but got `%s`", jsonObj.get("sql_query").toString())); - } - // validate the optional field `type` - if (jsonObj.get("type") != null && !jsonObj.get("type").isJsonNull()) { - ArrayTaskType.validateJsonElement(jsonObj.get("type")); - } - if (jsonObj.get("activity") != null && !jsonObj.get("activity").isJsonNull()) { - JsonArray jsonArrayactivity = jsonObj.getAsJsonArray("activity"); - if (jsonArrayactivity != null) { - // ensure the json data is an array - if (!jsonObj.get("activity").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `activity` to be an array in the JSON string but got `%s`", jsonObj.get("activity").toString())); - } - - // validate the optional field `activity` (array) - for (int i = 0; i < jsonArrayactivity.size(); i++) { - ArrayActivityLog.validateJsonElement(jsonArrayactivity.get(i)); - }; - } - } - if ((jsonObj.get("logs") != null && !jsonObj.get("logs").isJsonNull()) && !jsonObj.get("logs").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logs` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logs").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("sql_init_commands") != null && !jsonObj.get("sql_init_commands").isJsonNull() && !jsonObj.get("sql_init_commands").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `sql_init_commands` to be an array in the JSON string but got `%s`", jsonObj.get("sql_init_commands").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("sql_parameters") != null && !jsonObj.get("sql_parameters").isJsonNull() && !jsonObj.get("sql_parameters").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `sql_parameters` to be an array in the JSON string but got `%s`", jsonObj.get("sql_parameters").toString())); - } - // validate the optional field `result_format` - if (jsonObj.get("result_format") != null && !jsonObj.get("result_format").isJsonNull()) { - ResultFormat.validateJsonElement(jsonObj.get("result_format")); - } - if ((jsonObj.get("task_graph_uuid") != null && !jsonObj.get("task_graph_uuid").isJsonNull()) && !jsonObj.get("task_graph_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `task_graph_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("task_graph_uuid").toString())); - } - if ((jsonObj.get("client_node_uuid") != null && !jsonObj.get("client_node_uuid").isJsonNull()) && !jsonObj.get("client_node_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `client_node_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("client_node_uuid").toString())); - } - if ((jsonObj.get("cloud_provider") != null && !jsonObj.get("cloud_provider").isJsonNull()) && !jsonObj.get("cloud_provider").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `cloud_provider` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cloud_provider").toString())); - } - if ((jsonObj.get("cloud_region") != null && !jsonObj.get("cloud_region").isJsonNull()) && !jsonObj.get("cloud_region").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `cloud_region` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cloud_region").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -1119,28 +984,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayTask value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -1148,28 +991,7 @@ else if (entry.getValue() instanceof Character) public ArrayTask read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayTask instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskBrowserSidebar.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskBrowserSidebar.java index a05893f..5838f81 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskBrowserSidebar.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskBrowserSidebar.java @@ -51,7 +51,7 @@ /** * Object for ui array tasks browser page */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayTaskBrowserSidebar { public static final String SERIALIZED_NAME_ORGANIZATIONS = "organizations"; @SerializedName(SERIALIZED_NAME_ORGANIZATIONS) @@ -132,50 +132,6 @@ public void setResultCountByNamespace(Object resultCountByNamespace) { this.resultCountByNamespace = resultCountByNamespace; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayTaskBrowserSidebar instance itself - */ - public ArrayTaskBrowserSidebar putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -189,13 +145,12 @@ public boolean equals(Object o) { ArrayTaskBrowserSidebar arrayTaskBrowserSidebar = (ArrayTaskBrowserSidebar) o; return Objects.equals(this.organizations, arrayTaskBrowserSidebar.organizations) && Objects.equals(this.resultCountForAll, arrayTaskBrowserSidebar.resultCountForAll) && - Objects.equals(this.resultCountByNamespace, arrayTaskBrowserSidebar.resultCountByNamespace)&& - Objects.equals(this.additionalProperties, arrayTaskBrowserSidebar.additionalProperties); + Objects.equals(this.resultCountByNamespace, arrayTaskBrowserSidebar.resultCountByNamespace); } @Override public int hashCode() { - return Objects.hash(organizations, resultCountForAll, resultCountByNamespace, additionalProperties); + return Objects.hash(organizations, resultCountForAll, resultCountByNamespace); } @Override @@ -205,7 +160,6 @@ public String toString() { sb.append(" organizations: ").append(toIndentedString(organizations)).append("\n"); sb.append(" resultCountForAll: ").append(toIndentedString(resultCountForAll)).append("\n"); sb.append(" resultCountByNamespace: ").append(toIndentedString(resultCountByNamespace)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -248,6 +202,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayTaskBrowserSidebar is not found in the empty JSON string", ArrayTaskBrowserSidebar.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayTaskBrowserSidebar.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayTaskBrowserSidebar` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("organizations") != null && !jsonObj.get("organizations").isJsonNull() && !jsonObj.get("organizations").isJsonArray()) { @@ -270,28 +232,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayTaskBrowserSidebar value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -299,28 +239,7 @@ else if (entry.getValue() instanceof Character) public ArrayTaskBrowserSidebar read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayTaskBrowserSidebar instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskData.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskData.java index 08c3c17..2eeca0f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskData.java @@ -53,7 +53,7 @@ /** * Object including array tasks and metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayTaskData { public static final String SERIALIZED_NAME_ARRAY_TASKS = "array_tasks"; @SerializedName(SERIALIZED_NAME_ARRAY_TASKS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayTaskData instance itself - */ - public ArrayTaskData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } ArrayTaskData arrayTaskData = (ArrayTaskData) o; return Objects.equals(this.arrayTasks, arrayTaskData.arrayTasks) && - Objects.equals(this.paginationMetadata, arrayTaskData.paginationMetadata)&& - Objects.equals(this.additionalProperties, arrayTaskData.additionalProperties); + Objects.equals(this.paginationMetadata, arrayTaskData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(arrayTasks, paginationMetadata, additionalProperties); + return Objects.hash(arrayTasks, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class ArrayTaskData {\n"); sb.append(" arrayTasks: ").append(toIndentedString(arrayTasks)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayTaskData is not found in the empty JSON string", ArrayTaskData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayTaskData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayTaskData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("array_tasks") != null && !jsonObj.get("array_tasks").isJsonNull()) { JsonArray jsonArrayarrayTasks = jsonObj.getAsJsonArray("array_tasks"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayTaskData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public ArrayTaskData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayTaskData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskLog.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskLog.java index 5df8b37..52bb7a9 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskLog.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayTaskLog.java @@ -49,7 +49,7 @@ /** * Array task stderr/stdout logs */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayTaskLog { public static final String SERIALIZED_NAME_ARRAY_TASK_ID = "array_task_id"; @SerializedName(SERIALIZED_NAME_ARRAY_TASK_ID) @@ -99,50 +99,6 @@ public void setLogs(String logs) { this.logs = logs; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayTaskLog instance itself - */ - public ArrayTaskLog putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -155,13 +111,12 @@ public boolean equals(Object o) { } ArrayTaskLog arrayTaskLog = (ArrayTaskLog) o; return Objects.equals(this.arrayTaskId, arrayTaskLog.arrayTaskId) && - Objects.equals(this.logs, arrayTaskLog.logs)&& - Objects.equals(this.additionalProperties, arrayTaskLog.additionalProperties); + Objects.equals(this.logs, arrayTaskLog.logs); } @Override public int hashCode() { - return Objects.hash(arrayTaskId, logs, additionalProperties); + return Objects.hash(arrayTaskId, logs); } @Override @@ -170,7 +125,6 @@ public String toString() { sb.append("class ArrayTaskLog {\n"); sb.append(" arrayTaskId: ").append(toIndentedString(arrayTaskId)).append("\n"); sb.append(" logs: ").append(toIndentedString(logs)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -212,6 +166,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayTaskLog is not found in the empty JSON string", ArrayTaskLog.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayTaskLog.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayTaskLog` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("array_task_id") != null && !jsonObj.get("array_task_id").isJsonNull()) && !jsonObj.get("array_task_id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `array_task_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("array_task_id").toString())); @@ -236,28 +198,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayTaskLog value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -265,28 +205,7 @@ else if (entry.getValue() instanceof Character) public ArrayTaskLog read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayTaskLog instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayVacuumRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayVacuumRequest.java index 7edd44a..907bfe8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ArrayVacuumRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ArrayVacuumRequest.java @@ -50,7 +50,7 @@ /** * Request to consolidate an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ArrayVacuumRequest { public static final String SERIALIZED_NAME_CONFIG = "config"; @SerializedName(SERIALIZED_NAME_CONFIG) @@ -77,50 +77,6 @@ public void setConfig(TileDBConfig config) { this.config = config; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ArrayVacuumRequest instance itself - */ - public ArrayVacuumRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -132,13 +88,12 @@ public boolean equals(Object o) { return false; } ArrayVacuumRequest arrayVacuumRequest = (ArrayVacuumRequest) o; - return Objects.equals(this.config, arrayVacuumRequest.config)&& - Objects.equals(this.additionalProperties, arrayVacuumRequest.additionalProperties); + return Objects.equals(this.config, arrayVacuumRequest.config); } @Override public int hashCode() { - return Objects.hash(config, additionalProperties); + return Objects.hash(config); } @Override @@ -146,7 +101,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ArrayVacuumRequest {\n"); sb.append(" config: ").append(toIndentedString(config)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -187,6 +141,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayVacuumRequest is not found in the empty JSON string", ArrayVacuumRequest.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ArrayVacuumRequest.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ArrayVacuumRequest` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `config` if (jsonObj.get("config") != null && !jsonObj.get("config").isJsonNull()) { @@ -209,28 +171,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ArrayVacuumRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -238,28 +178,7 @@ else if (entry.getValue() instanceof Character) public ArrayVacuumRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ArrayVacuumRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AssetInfo.java b/src/main/java/io/tiledb/cloud/rest_api/model/AssetInfo.java index 51c7a7b..e969768 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AssetInfo.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AssetInfo.java @@ -54,7 +54,7 @@ /** * metadata of an asset */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class AssetInfo { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) @@ -287,50 +287,6 @@ public void setMetadata(MetadataStringified metadata) { this.metadata = metadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the AssetInfo instance itself - */ - public AssetInfo putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -351,13 +307,12 @@ public boolean equals(Object o) { Objects.equals(this.name, assetInfo.name) && Objects.equals(this.mimeType, assetInfo.mimeType) && Objects.equals(this.createdAt, assetInfo.createdAt) && - Objects.equals(this.metadata, assetInfo.metadata)&& - Objects.equals(this.additionalProperties, assetInfo.additionalProperties); + Objects.equals(this.metadata, assetInfo.metadata); } @Override public int hashCode() { - return Objects.hash(uuid, assetType, assetBackingType, assetOwnershipLevel, namespaceName, namespaceUuid, name, mimeType, createdAt, metadata, additionalProperties); + return Objects.hash(uuid, assetType, assetBackingType, assetOwnershipLevel, namespaceName, namespaceUuid, name, mimeType, createdAt, metadata); } @Override @@ -374,7 +329,6 @@ public String toString() { sb.append(" mimeType: ").append(toIndentedString(mimeType)).append("\n"); sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -424,6 +378,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in AssetInfo is not found in the empty JSON string", AssetInfo.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!AssetInfo.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `AssetInfo` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("uuid") != null && !jsonObj.get("uuid").isJsonNull()) && !jsonObj.get("uuid").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uuid").toString())); @@ -473,28 +435,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, AssetInfo value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -502,28 +442,7 @@ else if (entry.getValue() instanceof Character) public AssetInfo read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - AssetInfo instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AssetListResponse.java b/src/main/java/io/tiledb/cloud/rest_api/model/AssetListResponse.java index c5716ce..7ca1266 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AssetListResponse.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AssetListResponse.java @@ -53,7 +53,7 @@ /** * Asset associated with a TileDB Cloud account */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class AssetListResponse { public static final String SERIALIZED_NAME_DATA = "data"; @SerializedName(SERIALIZED_NAME_DATA) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the AssetListResponse instance itself - */ - public AssetListResponse putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } AssetListResponse assetListResponse = (AssetListResponse) o; return Objects.equals(this.data, assetListResponse.data) && - Objects.equals(this.paginationMetadata, assetListResponse.paginationMetadata)&& - Objects.equals(this.additionalProperties, assetListResponse.additionalProperties); + Objects.equals(this.paginationMetadata, assetListResponse.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(data, paginationMetadata, additionalProperties); + return Objects.hash(data, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class AssetListResponse {\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in AssetListResponse is not found in the empty JSON string", AssetListResponse.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!AssetListResponse.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `AssetListResponse` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("data") != null && !jsonObj.get("data").isJsonNull()) { JsonArray jsonArraydata = jsonObj.getAsJsonArray("data"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, AssetListResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public AssetListResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - AssetListResponse instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AssetLocations.java b/src/main/java/io/tiledb/cloud/rest_api/model/AssetLocations.java index 605b027..8cdc980 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AssetLocations.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AssetLocations.java @@ -50,7 +50,7 @@ /** * Custom storage locations on a per–asset type basis. If any is unset, a suffix of the owning (user/organization) `default_s3_path` is used. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class AssetLocations { public static final String SERIALIZED_NAME_ARRAYS = "arrays"; @SerializedName(SERIALIZED_NAME_ARRAYS) @@ -215,50 +215,6 @@ public void setUdfs(StorageLocation udfs) { this.udfs = udfs; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the AssetLocations instance itself - */ - public AssetLocations putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -276,13 +232,12 @@ public boolean equals(Object o) { Objects.equals(this.mlModels, assetLocations.mlModels) && Objects.equals(this.notebooks, assetLocations.notebooks) && Objects.equals(this.taskGraphs, assetLocations.taskGraphs) && - Objects.equals(this.udfs, assetLocations.udfs)&& - Objects.equals(this.additionalProperties, assetLocations.additionalProperties); + Objects.equals(this.udfs, assetLocations.udfs); } @Override public int hashCode() { - return Objects.hash(arrays, files, groups, mlModels, notebooks, taskGraphs, udfs, additionalProperties); + return Objects.hash(arrays, files, groups, mlModels, notebooks, taskGraphs, udfs); } @Override @@ -296,7 +251,6 @@ public String toString() { sb.append(" notebooks: ").append(toIndentedString(notebooks)).append("\n"); sb.append(" taskGraphs: ").append(toIndentedString(taskGraphs)).append("\n"); sb.append(" udfs: ").append(toIndentedString(udfs)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -343,35 +297,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in AssetLocations is not found in the empty JSON string", AssetLocations.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `arrays` - if (jsonObj.get("arrays") != null && !jsonObj.get("arrays").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("arrays")); - } - // validate the optional field `files` - if (jsonObj.get("files") != null && !jsonObj.get("files").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("files")); - } - // validate the optional field `groups` - if (jsonObj.get("groups") != null && !jsonObj.get("groups").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("groups")); - } - // validate the optional field `ml_models` - if (jsonObj.get("ml_models") != null && !jsonObj.get("ml_models").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("ml_models")); - } - // validate the optional field `notebooks` - if (jsonObj.get("notebooks") != null && !jsonObj.get("notebooks").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("notebooks")); - } - // validate the optional field `task_graphs` - if (jsonObj.get("task_graphs") != null && !jsonObj.get("task_graphs").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("task_graphs")); - } - // validate the optional field `udfs` - if (jsonObj.get("udfs") != null && !jsonObj.get("udfs").isJsonNull()) { - StorageLocation.validateJsonElement(jsonObj.get("udfs")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -389,28 +314,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, AssetLocations value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -418,28 +321,7 @@ else if (entry.getValue() instanceof Character) public AssetLocations read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - AssetLocations instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Attribute.java b/src/main/java/io/tiledb/cloud/rest_api/model/Attribute.java index e249794..a3db767 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Attribute.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Attribute.java @@ -53,7 +53,7 @@ /** * Attribute of array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Attribute { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -203,50 +203,6 @@ public void setFillValue(List fillValue) { this.fillValue = fillValue; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Attribute instance itself - */ - public Attribute putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -263,13 +219,12 @@ public boolean equals(Object o) { Objects.equals(this.filterPipeline, attribute.filterPipeline) && Objects.equals(this.cellValNum, attribute.cellValNum) && Objects.equals(this.nullable, attribute.nullable) && - Objects.equals(this.fillValue, attribute.fillValue)&& - Objects.equals(this.additionalProperties, attribute.additionalProperties); + Objects.equals(this.fillValue, attribute.fillValue); } @Override public int hashCode() { - return Objects.hash(name, type, filterPipeline, cellValNum, nullable, fillValue, additionalProperties); + return Objects.hash(name, type, filterPipeline, cellValNum, nullable, fillValue); } @Override @@ -282,7 +237,6 @@ public String toString() { sb.append(" cellValNum: ").append(toIndentedString(cellValNum)).append("\n"); sb.append(" nullable: ").append(toIndentedString(nullable)).append("\n"); sb.append(" fillValue: ").append(toIndentedString(fillValue)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -332,25 +286,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Attribute is not found in the empty JSON string", Attribute.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : Attribute.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - // validate the required field `type` - Datatype.validateJsonElement(jsonObj.get("type")); - // validate the required field `filterPipeline` - FilterPipeline.validateJsonElement(jsonObj.get("filterPipeline")); - // ensure the optional json data is an array if present - if (jsonObj.get("fillValue") != null && !jsonObj.get("fillValue").isJsonNull() && !jsonObj.get("fillValue").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `fillValue` to be an array in the JSON string but got `%s`", jsonObj.get("fillValue").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -368,28 +303,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Attribute value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -397,28 +310,7 @@ else if (entry.getValue() instanceof Character) public Attribute read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Attribute instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferHeader.java b/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferHeader.java index 9925c98..974127a 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferHeader.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferHeader.java @@ -49,7 +49,7 @@ /** * Represents an attribute buffer header information */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class AttributeBufferHeader { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -122,50 +122,6 @@ public void setVarLenBufferSizeInBytes(Integer varLenBufferSizeInBytes) { this.varLenBufferSizeInBytes = varLenBufferSizeInBytes; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the AttributeBufferHeader instance itself - */ - public AttributeBufferHeader putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { AttributeBufferHeader attributeBufferHeader = (AttributeBufferHeader) o; return Objects.equals(this.name, attributeBufferHeader.name) && Objects.equals(this.fixedLenBufferSizeInBytes, attributeBufferHeader.fixedLenBufferSizeInBytes) && - Objects.equals(this.varLenBufferSizeInBytes, attributeBufferHeader.varLenBufferSizeInBytes)&& - Objects.equals(this.additionalProperties, attributeBufferHeader.additionalProperties); + Objects.equals(this.varLenBufferSizeInBytes, attributeBufferHeader.varLenBufferSizeInBytes); } @Override public int hashCode() { - return Objects.hash(name, fixedLenBufferSizeInBytes, varLenBufferSizeInBytes, additionalProperties); + return Objects.hash(name, fixedLenBufferSizeInBytes, varLenBufferSizeInBytes); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" fixedLenBufferSizeInBytes: ").append(toIndentedString(fixedLenBufferSizeInBytes)).append("\n"); sb.append(" varLenBufferSizeInBytes: ").append(toIndentedString(varLenBufferSizeInBytes)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -242,6 +196,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!AttributeBufferHeader.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `AttributeBufferHeader` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : AttributeBufferHeader.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -269,28 +231,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, AttributeBufferHeader value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -298,28 +238,7 @@ else if (entry.getValue() instanceof Character) public AttributeBufferHeader read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - AttributeBufferHeader instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferSize.java b/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferSize.java index 7e6a707..df3e5cd 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferSize.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/AttributeBufferSize.java @@ -49,7 +49,7 @@ /** * object representing buffer size of an attribute */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class AttributeBufferSize { public static final String SERIALIZED_NAME_ATTRIBUTE = "attribute"; @SerializedName(SERIALIZED_NAME_ATTRIBUTE) @@ -122,50 +122,6 @@ public void setDataBytes(Integer dataBytes) { this.dataBytes = dataBytes; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the AttributeBufferSize instance itself - */ - public AttributeBufferSize putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { AttributeBufferSize attributeBufferSize = (AttributeBufferSize) o; return Objects.equals(this.attribute, attributeBufferSize.attribute) && Objects.equals(this.offsetBytes, attributeBufferSize.offsetBytes) && - Objects.equals(this.dataBytes, attributeBufferSize.dataBytes)&& - Objects.equals(this.additionalProperties, attributeBufferSize.additionalProperties); + Objects.equals(this.dataBytes, attributeBufferSize.dataBytes); } @Override public int hashCode() { - return Objects.hash(attribute, offsetBytes, dataBytes, additionalProperties); + return Objects.hash(attribute, offsetBytes, dataBytes); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" attribute: ").append(toIndentedString(attribute)).append("\n"); sb.append(" offsetBytes: ").append(toIndentedString(offsetBytes)).append("\n"); sb.append(" dataBytes: ").append(toIndentedString(dataBytes)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -241,17 +195,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in AttributeBufferSize is not found in the empty JSON string", AttributeBufferSize.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : AttributeBufferSize.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (!jsonObj.get("attribute").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `attribute` to be a primitive type in the JSON string but got `%s`", jsonObj.get("attribute").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -269,28 +212,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, AttributeBufferSize value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -298,28 +219,7 @@ else if (entry.getValue() instanceof Character) public AttributeBufferSize read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - AttributeBufferSize instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Backoff.java b/src/main/java/io/tiledb/cloud/rest_api/model/Backoff.java index 6b8bfde..e5849c7 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Backoff.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Backoff.java @@ -49,7 +49,7 @@ /** * Backoff is a backoff strategy to use within retryStrategy */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Backoff { public static final String SERIALIZED_NAME_DURATION = "duration"; @SerializedName(SERIALIZED_NAME_DURATION) @@ -122,50 +122,6 @@ public void setMaxDuration(String maxDuration) { this.maxDuration = maxDuration; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Backoff instance itself - */ - public Backoff putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { Backoff backoff = (Backoff) o; return Objects.equals(this.duration, backoff.duration) && Objects.equals(this.factor, backoff.factor) && - Objects.equals(this.maxDuration, backoff.maxDuration)&& - Objects.equals(this.additionalProperties, backoff.additionalProperties); + Objects.equals(this.maxDuration, backoff.maxDuration); } @Override public int hashCode() { - return Objects.hash(duration, factor, maxDuration, additionalProperties); + return Objects.hash(duration, factor, maxDuration); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" duration: ").append(toIndentedString(duration)).append("\n"); sb.append(" factor: ").append(toIndentedString(factor)).append("\n"); sb.append(" maxDuration: ").append(toIndentedString(maxDuration)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Backoff is not found in the empty JSON string", Backoff.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Backoff.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Backoff` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("duration") != null && !jsonObj.get("duration").isJsonNull()) && !jsonObj.get("duration").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `duration` to be a primitive type in the JSON string but got `%s`", jsonObj.get("duration").toString())); @@ -262,28 +224,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Backoff value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -291,28 +231,7 @@ else if (entry.getValue() instanceof Character) public Backoff read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Backoff instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequest.java new file mode 100644 index 0000000..b52988e --- /dev/null +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequest.java @@ -0,0 +1,232 @@ +/* + * TileDB Storage Platform API + * TileDB Storage Platform REST API + * + * The version of the OpenAPI document: 2.17.51 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package io.tiledb.cloud.rest_api.model; + +import java.util.Objects; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; +import com.google.gson.TypeAdapter; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import io.tiledb.cloud.rest_api.JSON; + +/** + * Request body to change the credentials of the given assets + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") +public class ChangeAssetCredentialsRequest { + public static final String SERIALIZED_NAME_ACCESS_CREDENTIALS = "access_credentials"; + @SerializedName(SERIALIZED_NAME_ACCESS_CREDENTIALS) + private String accessCredentials; + + public static final String SERIALIZED_NAME_ASSET_UUIDS = "asset_uuids"; + @SerializedName(SERIALIZED_NAME_ASSET_UUIDS) + private List assetUuids = new ArrayList<>(); + + public ChangeAssetCredentialsRequest() { + } + + public ChangeAssetCredentialsRequest accessCredentials(String accessCredentials) { + this.accessCredentials = accessCredentials; + return this; + } + + /** + * The name or uuid of the access credentials + * @return accessCredentials + */ + @javax.annotation.Nonnull + public String getAccessCredentials() { + return accessCredentials; + } + + public void setAccessCredentials(String accessCredentials) { + this.accessCredentials = accessCredentials; + } + + + public ChangeAssetCredentialsRequest assetUuids(List assetUuids) { + this.assetUuids = assetUuids; + return this; + } + + public ChangeAssetCredentialsRequest addAssetUuidsItem(String assetUuidsItem) { + if (this.assetUuids == null) { + this.assetUuids = new ArrayList<>(); + } + this.assetUuids.add(assetUuidsItem); + return this; + } + + /** + * The list of asset uuids to have their credentials changed + * @return assetUuids + */ + @javax.annotation.Nonnull + public List getAssetUuids() { + return assetUuids; + } + + public void setAssetUuids(List assetUuids) { + this.assetUuids = assetUuids; + } + + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChangeAssetCredentialsRequest changeAssetCredentialsRequest = (ChangeAssetCredentialsRequest) o; + return Objects.equals(this.accessCredentials, changeAssetCredentialsRequest.accessCredentials) && + Objects.equals(this.assetUuids, changeAssetCredentialsRequest.assetUuids); + } + + @Override + public int hashCode() { + return Objects.hash(accessCredentials, assetUuids); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ChangeAssetCredentialsRequest {\n"); + sb.append(" accessCredentials: ").append(toIndentedString(accessCredentials)).append("\n"); + sb.append(" assetUuids: ").append(toIndentedString(assetUuids)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + + public static HashSet openapiFields; + public static HashSet openapiRequiredFields; + + static { + // a set of all properties/fields (JSON key names) + openapiFields = new HashSet(); + openapiFields.add("access_credentials"); + openapiFields.add("asset_uuids"); + + // a set of required properties/fields (JSON key names) + openapiRequiredFields = new HashSet(); + openapiRequiredFields.add("access_credentials"); + openapiRequiredFields.add("asset_uuids"); + } + + /** + * Validates the JSON Element and throws an exception if issues found + * + * @param jsonElement JSON Element + * @throws IOException if the JSON Element is invalid with respect to ChangeAssetCredentialsRequest + */ + public static void validateJsonElement(JsonElement jsonElement) throws IOException { + if (jsonElement == null) { + if (!ChangeAssetCredentialsRequest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null + throw new IllegalArgumentException(String.format("The required field(s) %s in ChangeAssetCredentialsRequest is not found in the empty JSON string", ChangeAssetCredentialsRequest.openapiRequiredFields.toString())); + } + } + } + + public static class CustomTypeAdapterFactory implements TypeAdapterFactory { + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + if (!ChangeAssetCredentialsRequest.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'ChangeAssetCredentialsRequest' and its subtypes + } + final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); + final TypeAdapter thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(ChangeAssetCredentialsRequest.class)); + + return (TypeAdapter) new TypeAdapter() { + @Override + public void write(JsonWriter out, ChangeAssetCredentialsRequest value) throws IOException { + JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); + elementAdapter.write(out, obj); + } + + @Override + public ChangeAssetCredentialsRequest read(JsonReader in) throws IOException { + JsonElement jsonElement = elementAdapter.read(in); + validateJsonElement(jsonElement); + return thisAdapter.fromJsonTree(jsonElement); + } + + }.nullSafe(); + } + } + + /** + * Create an instance of ChangeAssetCredentialsRequest given an JSON string + * + * @param jsonString JSON string + * @return An instance of ChangeAssetCredentialsRequest + * @throws IOException if the JSON string is invalid with respect to ChangeAssetCredentialsRequest + */ + public static ChangeAssetCredentialsRequest fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, ChangeAssetCredentialsRequest.class); + } + + /** + * Convert an instance of ChangeAssetCredentialsRequest to an JSON string + * + * @return JSON string + */ + public String toJson() { + return JSON.getGson().toJson(this); + } +} + diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Dimension.java b/src/main/java/io/tiledb/cloud/rest_api/model/Dimension.java index 4f8347b..777dde2 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Dimension.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Dimension.java @@ -53,7 +53,7 @@ /** * Dimension of array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Dimension { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -195,50 +195,6 @@ public void setFilterPipeline(FilterPipeline filterPipeline) { this.filterPipeline = filterPipeline; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Dimension instance itself - */ - public Dimension putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -255,13 +211,12 @@ public boolean equals(Object o) { Objects.equals(this.domain, dimension.domain) && Objects.equals(this.nullTileExtent, dimension.nullTileExtent) && Objects.equals(this.tileExtent, dimension.tileExtent) && - Objects.equals(this.filterPipeline, dimension.filterPipeline)&& - Objects.equals(this.additionalProperties, dimension.additionalProperties); + Objects.equals(this.filterPipeline, dimension.filterPipeline); } @Override public int hashCode() { - return Objects.hash(name, type, domain, nullTileExtent, tileExtent, filterPipeline, additionalProperties); + return Objects.hash(name, type, domain, nullTileExtent, tileExtent, filterPipeline); } @Override @@ -274,7 +229,6 @@ public String toString() { sb.append(" nullTileExtent: ").append(toIndentedString(nullTileExtent)).append("\n"); sb.append(" tileExtent: ").append(toIndentedString(tileExtent)).append("\n"); sb.append(" filterPipeline: ").append(toIndentedString(filterPipeline)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -323,29 +277,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Dimension is not found in the empty JSON string", Dimension.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : Dimension.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - // validate the required field `type` - Datatype.validateJsonElement(jsonObj.get("type")); - // validate the required field `domain` - DomainArray.validateJsonElement(jsonObj.get("domain")); - // validate the optional field `tileExtent` - if (jsonObj.get("tileExtent") != null && !jsonObj.get("tileExtent").isJsonNull()) { - DimensionTileExtent.validateJsonElement(jsonObj.get("tileExtent")); - } - // validate the optional field `filterPipeline` - if (jsonObj.get("filterPipeline") != null && !jsonObj.get("filterPipeline").isJsonNull()) { - FilterPipeline.validateJsonElement(jsonObj.get("filterPipeline")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -363,28 +294,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Dimension value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -392,28 +301,7 @@ else if (entry.getValue() instanceof Character) public Dimension read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Dimension instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/DimensionCoordinate.java b/src/main/java/io/tiledb/cloud/rest_api/model/DimensionCoordinate.java index 51f82f1..bd80325 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/DimensionCoordinate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/DimensionCoordinate.java @@ -49,7 +49,7 @@ /** * A single, typed coordinate for a dimension */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class DimensionCoordinate { public static final String SERIALIZED_NAME_INT8 = "int8"; @SerializedName(SERIALIZED_NAME_INT8) @@ -283,50 +283,6 @@ public void setFloat64(Double float64) { this.float64 = float64; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the DimensionCoordinate instance itself - */ - public DimensionCoordinate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -347,13 +303,12 @@ public boolean equals(Object o) { Objects.equals(this.int64, dimensionCoordinate.int64) && Objects.equals(this.uint64, dimensionCoordinate.uint64) && Objects.equals(this.float32, dimensionCoordinate.float32) && - Objects.equals(this.float64, dimensionCoordinate.float64)&& - Objects.equals(this.additionalProperties, dimensionCoordinate.additionalProperties); + Objects.equals(this.float64, dimensionCoordinate.float64); } @Override public int hashCode() { - return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64, additionalProperties); + return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64); } @Override @@ -370,7 +325,6 @@ public String toString() { sb.append(" uint64: ").append(toIndentedString(uint64)).append("\n"); sb.append(" float32: ").append(toIndentedString(float32)).append("\n"); sb.append(" float64: ").append(toIndentedString(float64)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -420,7 +374,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in DimensionCoordinate is not found in the empty JSON string", DimensionCoordinate.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -438,28 +391,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, DimensionCoordinate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -467,28 +398,7 @@ else if (entry.getValue() instanceof Character) public DimensionCoordinate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - DimensionCoordinate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/DimensionTileExtent.java b/src/main/java/io/tiledb/cloud/rest_api/model/DimensionTileExtent.java index f914e42..8c38452 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/DimensionTileExtent.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/DimensionTileExtent.java @@ -49,7 +49,7 @@ /** * Extent of tile */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class DimensionTileExtent { public static final String SERIALIZED_NAME_INT8 = "int8"; @SerializedName(SERIALIZED_NAME_INT8) @@ -283,50 +283,6 @@ public void setFloat64(Integer float64) { this.float64 = float64; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the DimensionTileExtent instance itself - */ - public DimensionTileExtent putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -347,13 +303,12 @@ public boolean equals(Object o) { Objects.equals(this.int64, dimensionTileExtent.int64) && Objects.equals(this.uint64, dimensionTileExtent.uint64) && Objects.equals(this.float32, dimensionTileExtent.float32) && - Objects.equals(this.float64, dimensionTileExtent.float64)&& - Objects.equals(this.additionalProperties, dimensionTileExtent.additionalProperties); + Objects.equals(this.float64, dimensionTileExtent.float64); } @Override public int hashCode() { - return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64, additionalProperties); + return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64); } @Override @@ -370,7 +325,6 @@ public String toString() { sb.append(" uint64: ").append(toIndentedString(uint64)).append("\n"); sb.append(" float32: ").append(toIndentedString(float32)).append("\n"); sb.append(" float64: ").append(toIndentedString(float64)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -420,7 +374,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in DimensionTileExtent is not found in the empty JSON string", DimensionTileExtent.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -438,28 +391,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, DimensionTileExtent value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -467,28 +398,7 @@ else if (entry.getValue() instanceof Character) public DimensionTileExtent read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - DimensionTileExtent instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Domain.java b/src/main/java/io/tiledb/cloud/rest_api/model/Domain.java index 63e86c9..6e7c4bb 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Domain.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Domain.java @@ -54,7 +54,7 @@ /** * Domain of array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Domain { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -158,50 +158,6 @@ public void setDimensions(List dimensions) { this.dimensions = dimensions; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Domain instance itself - */ - public Domain putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -216,13 +172,12 @@ public boolean equals(Object o) { return Objects.equals(this.type, domain.type) && Objects.equals(this.tileOrder, domain.tileOrder) && Objects.equals(this.cellOrder, domain.cellOrder) && - Objects.equals(this.dimensions, domain.dimensions)&& - Objects.equals(this.additionalProperties, domain.additionalProperties); + Objects.equals(this.dimensions, domain.dimensions); } @Override public int hashCode() { - return Objects.hash(type, tileOrder, cellOrder, dimensions, additionalProperties); + return Objects.hash(type, tileOrder, cellOrder, dimensions); } @Override @@ -233,7 +188,6 @@ public String toString() { sb.append(" tileOrder: ").append(toIndentedString(tileOrder)).append("\n"); sb.append(" cellOrder: ").append(toIndentedString(cellOrder)).append("\n"); sb.append(" dimensions: ").append(toIndentedString(dimensions)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -282,6 +236,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Domain.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Domain` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : Domain.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -322,28 +284,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Domain value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -351,28 +291,7 @@ else if (entry.getValue() instanceof Character) public Domain read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Domain instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/DomainArray.java b/src/main/java/io/tiledb/cloud/rest_api/model/DomainArray.java index c2d311f..5756bac 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/DomainArray.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/DomainArray.java @@ -51,7 +51,7 @@ /** * Domain object for an array of each type */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class DomainArray { public static final String SERIALIZED_NAME_INT8 = "int8"; @SerializedName(SERIALIZED_NAME_INT8) @@ -365,50 +365,6 @@ public void setFloat64(List float64) { this.float64 = float64; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the DomainArray instance itself - */ - public DomainArray putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -429,13 +385,12 @@ public boolean equals(Object o) { Objects.equals(this.int64, domainArray.int64) && Objects.equals(this.uint64, domainArray.uint64) && Objects.equals(this.float32, domainArray.float32) && - Objects.equals(this.float64, domainArray.float64)&& - Objects.equals(this.additionalProperties, domainArray.additionalProperties); + Objects.equals(this.float64, domainArray.float64); } @Override public int hashCode() { - return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64, additionalProperties); + return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64); } @Override @@ -452,7 +407,6 @@ public String toString() { sb.append(" uint64: ").append(toIndentedString(uint64)).append("\n"); sb.append(" float32: ").append(toIndentedString(float32)).append("\n"); sb.append(" float64: ").append(toIndentedString(float64)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -502,6 +456,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in DomainArray is not found in the empty JSON string", DomainArray.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!DomainArray.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `DomainArray` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("int8") != null && !jsonObj.get("int8").isJsonNull() && !jsonObj.get("int8").isJsonArray()) { @@ -560,28 +522,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, DomainArray value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -589,28 +529,7 @@ else if (entry.getValue() instanceof Character) public DomainArray read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - DomainArray instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/DomainCheckResult.java b/src/main/java/io/tiledb/cloud/rest_api/model/DomainCheckResult.java index b8e2988..8ad3205 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/DomainCheckResult.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/DomainCheckResult.java @@ -51,7 +51,7 @@ /** * The record of a check of a single domain's status. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class DomainCheckResult { public static final String SERIALIZED_NAME_TIME = "time"; @SerializedName(SERIALIZED_NAME_TIME) @@ -101,50 +101,6 @@ public void setStatus(DomainCheckStatus status) { this.status = status; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the DomainCheckResult instance itself - */ - public DomainCheckResult putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -157,13 +113,12 @@ public boolean equals(Object o) { } DomainCheckResult domainCheckResult = (DomainCheckResult) o; return Objects.equals(this.time, domainCheckResult.time) && - Objects.equals(this.status, domainCheckResult.status)&& - Objects.equals(this.additionalProperties, domainCheckResult.additionalProperties); + Objects.equals(this.status, domainCheckResult.status); } @Override public int hashCode() { - return Objects.hash(time, status, additionalProperties); + return Objects.hash(time, status); } @Override @@ -172,7 +127,6 @@ public String toString() { sb.append("class DomainCheckResult {\n"); sb.append(" time: ").append(toIndentedString(time)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -214,11 +168,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in DomainCheckResult is not found in the empty JSON string", DomainCheckResult.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `status` - if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { - DomainCheckStatus.validateJsonElement(jsonObj.get("status")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -236,28 +185,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, DomainCheckResult value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -265,28 +192,7 @@ else if (entry.getValue() instanceof Character) public DomainCheckResult read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - DomainCheckResult instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Enumeration.java b/src/main/java/io/tiledb/cloud/rest_api/model/Enumeration.java index 590c9fd..7ebbd2f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Enumeration.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Enumeration.java @@ -51,7 +51,7 @@ /** * The enumerations of a single attribute */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Enumeration { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -232,50 +232,6 @@ public void setOffsets(List offsets) { this.offsets = offsets; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Enumeration instance itself - */ - public Enumeration putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -293,13 +249,12 @@ public boolean equals(Object o) { Objects.equals(this.cellValNum, enumeration.cellValNum) && Objects.equals(this.ordered, enumeration.ordered) && Objects.equals(this.data, enumeration.data) && - Objects.equals(this.offsets, enumeration.offsets)&& - Objects.equals(this.additionalProperties, enumeration.additionalProperties); + Objects.equals(this.offsets, enumeration.offsets); } @Override public int hashCode() { - return Objects.hash(name, pathName, type, cellValNum, ordered, data, offsets, additionalProperties); + return Objects.hash(name, pathName, type, cellValNum, ordered, data, offsets); } @Override @@ -313,7 +268,6 @@ public String toString() { sb.append(" ordered: ").append(toIndentedString(ordered)).append("\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); sb.append(" offsets: ").append(toIndentedString(offsets)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -360,6 +314,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Enumeration is not found in the empty JSON string", Enumeration.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Enumeration.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Enumeration` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); @@ -395,28 +357,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Enumeration value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -424,28 +364,7 @@ else if (entry.getValue() instanceof Character) public Enumeration read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Enumeration instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Error.java b/src/main/java/io/tiledb/cloud/rest_api/model/Error.java index a32b041..e76f388 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Error.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Error.java @@ -49,7 +49,7 @@ /** * Error */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Error { public static final String SERIALIZED_NAME_CODE = "code"; @SerializedName(SERIALIZED_NAME_CODE) @@ -122,50 +122,6 @@ public void setRequestId(String requestId) { this.requestId = requestId; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Error instance itself - */ - public Error putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { Error error = (Error) o; return Objects.equals(this.code, error.code) && Objects.equals(this.message, error.message) && - Objects.equals(this.requestId, error.requestId)&& - Objects.equals(this.additionalProperties, error.additionalProperties); + Objects.equals(this.requestId, error.requestId); } @Override public int hashCode() { - return Objects.hash(code, message, requestId, additionalProperties); + return Objects.hash(code, message, requestId); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" code: ").append(toIndentedString(code)).append("\n"); sb.append(" message: ").append(toIndentedString(message)).append("\n"); sb.append(" requestId: ").append(toIndentedString(requestId)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Error is not found in the empty JSON string", Error.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Error.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Error` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("message") != null && !jsonObj.get("message").isJsonNull()) && !jsonObj.get("message").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `message` to be a primitive type in the JSON string but got `%s`", jsonObj.get("message").toString())); @@ -262,28 +224,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Error value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -291,28 +231,7 @@ else if (entry.getValue() instanceof Character) public Error read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Error instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FileCreate.java b/src/main/java/io/tiledb/cloud/rest_api/model/FileCreate.java index 139abd4..768bedb 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FileCreate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FileCreate.java @@ -49,7 +49,7 @@ /** * Input/Output information required to create a new file */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FileCreate { public static final String SERIALIZED_NAME_INPUT_URI = "input_uri"; @SerializedName(SERIALIZED_NAME_INPUT_URI) @@ -122,50 +122,6 @@ public void setName(String name) { this.name = name; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FileCreate instance itself - */ - public FileCreate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { FileCreate fileCreate = (FileCreate) o; return Objects.equals(this.inputUri, fileCreate.inputUri) && Objects.equals(this.outputUri, fileCreate.outputUri) && - Objects.equals(this.name, fileCreate.name)&& - Objects.equals(this.additionalProperties, fileCreate.additionalProperties); + Objects.equals(this.name, fileCreate.name); } @Override public int hashCode() { - return Objects.hash(inputUri, outputUri, name, additionalProperties); + return Objects.hash(inputUri, outputUri, name); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" inputUri: ").append(toIndentedString(inputUri)).append("\n"); sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FileCreate is not found in the empty JSON string", FileCreate.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!FileCreate.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `FileCreate` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("input_uri") != null && !jsonObj.get("input_uri").isJsonNull()) && !jsonObj.get("input_uri").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `input_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("input_uri").toString())); @@ -265,28 +227,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FileCreate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +234,7 @@ else if (entry.getValue() instanceof Character) public FileCreate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FileCreate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FileCreated.java b/src/main/java/io/tiledb/cloud/rest_api/model/FileCreated.java index 5726a65..e39396f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FileCreated.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FileCreated.java @@ -49,7 +49,7 @@ /** * Created file name and information */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FileCreated { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -99,50 +99,6 @@ public void setFileName(String fileName) { this.fileName = fileName; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FileCreated instance itself - */ - public FileCreated putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -155,13 +111,12 @@ public boolean equals(Object o) { } FileCreated fileCreated = (FileCreated) o; return Objects.equals(this.outputUri, fileCreated.outputUri) && - Objects.equals(this.fileName, fileCreated.fileName)&& - Objects.equals(this.additionalProperties, fileCreated.additionalProperties); + Objects.equals(this.fileName, fileCreated.fileName); } @Override public int hashCode() { - return Objects.hash(outputUri, fileName, additionalProperties); + return Objects.hash(outputUri, fileName); } @Override @@ -170,7 +125,6 @@ public String toString() { sb.append("class FileCreated {\n"); sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); sb.append(" fileName: ").append(toIndentedString(fileName)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -212,6 +166,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FileCreated is not found in the empty JSON string", FileCreated.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!FileCreated.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `FileCreated` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("output_uri") != null && !jsonObj.get("output_uri").isJsonNull()) && !jsonObj.get("output_uri").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `output_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("output_uri").toString())); @@ -236,28 +198,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FileCreated value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -265,28 +205,7 @@ else if (entry.getValue() instanceof Character) public FileCreated read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FileCreated instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FileExport.java b/src/main/java/io/tiledb/cloud/rest_api/model/FileExport.java index b1dc89a..98fe037 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FileExport.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FileExport.java @@ -49,7 +49,7 @@ /** * Output information required to export a file */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FileExport { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -76,50 +76,6 @@ public void setOutputUri(String outputUri) { this.outputUri = outputUri; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FileExport instance itself - */ - public FileExport putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -131,13 +87,12 @@ public boolean equals(Object o) { return false; } FileExport fileExport = (FileExport) o; - return Objects.equals(this.outputUri, fileExport.outputUri)&& - Objects.equals(this.additionalProperties, fileExport.additionalProperties); + return Objects.equals(this.outputUri, fileExport.outputUri); } @Override public int hashCode() { - return Objects.hash(outputUri, additionalProperties); + return Objects.hash(outputUri); } @Override @@ -145,7 +100,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FileExport {\n"); sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -186,10 +140,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FileExport is not found in the empty JSON string", FileExport.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("output_uri") != null && !jsonObj.get("output_uri").isJsonNull()) && !jsonObj.get("output_uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `output_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("output_uri").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -207,28 +157,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FileExport value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -236,28 +164,7 @@ else if (entry.getValue() instanceof Character) public FileExport read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FileExport instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FileExported.java b/src/main/java/io/tiledb/cloud/rest_api/model/FileExported.java index 2aee599..907bb22 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FileExported.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FileExported.java @@ -49,7 +49,7 @@ /** * Output uri of the exported file */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FileExported { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -76,50 +76,6 @@ public void setOutputUri(String outputUri) { this.outputUri = outputUri; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FileExported instance itself - */ - public FileExported putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -131,13 +87,12 @@ public boolean equals(Object o) { return false; } FileExported fileExported = (FileExported) o; - return Objects.equals(this.outputUri, fileExported.outputUri)&& - Objects.equals(this.additionalProperties, fileExported.additionalProperties); + return Objects.equals(this.outputUri, fileExported.outputUri); } @Override public int hashCode() { - return Objects.hash(outputUri, additionalProperties); + return Objects.hash(outputUri); } @Override @@ -145,7 +100,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FileExported {\n"); sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -186,6 +140,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FileExported is not found in the empty JSON string", FileExported.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!FileExported.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `FileExported` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("output_uri") != null && !jsonObj.get("output_uri").isJsonNull()) && !jsonObj.get("output_uri").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `output_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("output_uri").toString())); @@ -207,28 +169,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FileExported value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -236,28 +176,7 @@ else if (entry.getValue() instanceof Character) public FileExported read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FileExported instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FileUploaded.java b/src/main/java/io/tiledb/cloud/rest_api/model/FileUploaded.java index 003f786..1a36432 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FileUploaded.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FileUploaded.java @@ -49,7 +49,7 @@ /** * Uploaded file name and information */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FileUploaded { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -59,6 +59,10 @@ public class FileUploaded { @SerializedName(SERIALIZED_NAME_FILE_NAME) private String fileName; + public static final String SERIALIZED_NAME_ASSET_ID = "asset_id"; + @SerializedName(SERIALIZED_NAME_ASSET_ID) + private String assetId; + public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) private String id; @@ -104,70 +108,45 @@ public void setFileName(String fileName) { } - public FileUploaded id(String id) { - this.id = id; + public FileUploaded assetId(String assetId) { + this.assetId = assetId; return this; } /** - * unique ID of the uploaded file - * @return id + * The asset id of the created Group + * @return assetId */ @javax.annotation.Nonnull - public String getId() { - return id; + public String getAssetId() { + return assetId; } - public void setId(String id) { - this.id = id; + public void setAssetId(String assetId) { + this.assetId = assetId; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FileUploaded instance itself - */ - public FileUploaded putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); + public FileUploaded id(String id) { + this.id = id; return this; } /** - * Return the additional (undeclared) property. - * - * @return a map of objects + * unique ID of the uploaded file + * @return id */ - public Map getAdditionalProperties() { - return additionalProperties; + @javax.annotation.Nonnull + public String getId() { + return id; } - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + public void setId(String id) { + this.id = id; } + @Override public boolean equals(Object o) { if (this == o) { @@ -179,13 +158,13 @@ public boolean equals(Object o) { FileUploaded fileUploaded = (FileUploaded) o; return Objects.equals(this.outputUri, fileUploaded.outputUri) && Objects.equals(this.fileName, fileUploaded.fileName) && - Objects.equals(this.id, fileUploaded.id)&& - Objects.equals(this.additionalProperties, fileUploaded.additionalProperties); + Objects.equals(this.assetId, fileUploaded.assetId) && + Objects.equals(this.id, fileUploaded.id); } @Override public int hashCode() { - return Objects.hash(outputUri, fileName, id, additionalProperties); + return Objects.hash(outputUri, fileName, assetId, id); } @Override @@ -194,8 +173,8 @@ public String toString() { sb.append("class FileUploaded {\n"); sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); sb.append(" fileName: ").append(toIndentedString(fileName)).append("\n"); + sb.append(" assetId: ").append(toIndentedString(assetId)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -220,10 +199,12 @@ private String toIndentedString(Object o) { openapiFields = new HashSet(); openapiFields.add("output_uri"); openapiFields.add("file_name"); + openapiFields.add("asset_id"); openapiFields.add("id"); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(); + openapiRequiredFields.add("asset_id"); openapiRequiredFields.add("id"); } @@ -240,6 +221,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!FileUploaded.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `FileUploaded` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : FileUploaded.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -253,6 +242,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if ((jsonObj.get("file_name") != null && !jsonObj.get("file_name").isJsonNull()) && !jsonObj.get("file_name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `file_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("file_name").toString())); } + if (!jsonObj.get("asset_id").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `asset_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("asset_id").toString())); + } if (!jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); } @@ -273,28 +265,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FileUploaded value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -302,28 +272,7 @@ else if (entry.getValue() instanceof Character) public FileUploaded read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FileUploaded instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Filter.java b/src/main/java/io/tiledb/cloud/rest_api/model/Filter.java index 6a9f2c0..faf701f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Filter.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Filter.java @@ -51,7 +51,7 @@ /** * Filter */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Filter { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -101,50 +101,6 @@ public void setData(FilterData data) { this.data = data; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Filter instance itself - */ - public Filter putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -157,13 +113,12 @@ public boolean equals(Object o) { } Filter filter = (Filter) o; return Objects.equals(this.type, filter.type) && - Objects.equals(this.data, filter.data)&& - Objects.equals(this.additionalProperties, filter.additionalProperties); + Objects.equals(this.data, filter.data); } @Override public int hashCode() { - return Objects.hash(type, data, additionalProperties); + return Objects.hash(type, data); } @Override @@ -172,7 +127,6 @@ public String toString() { sb.append("class Filter {\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" data: ").append(toIndentedString(data)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -215,20 +169,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Filter is not found in the empty JSON string", Filter.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : Filter.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the required field `type` - FilterType.validateJsonElement(jsonObj.get("type")); - // validate the optional field `data` - if (jsonObj.get("data") != null && !jsonObj.get("data").isJsonNull()) { - FilterData.validateJsonElement(jsonObj.get("data")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -246,28 +186,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Filter value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -275,28 +193,7 @@ else if (entry.getValue() instanceof Character) public Filter read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Filter instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FilterData.java b/src/main/java/io/tiledb/cloud/rest_api/model/FilterData.java index 9f53545..a9cac90 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FilterData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FilterData.java @@ -49,7 +49,7 @@ /** * Filter data */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FilterData { public static final String SERIALIZED_NAME_INT8 = "int8"; @SerializedName(SERIALIZED_NAME_INT8) @@ -283,50 +283,6 @@ public void setFloat64(Integer float64) { this.float64 = float64; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FilterData instance itself - */ - public FilterData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -347,13 +303,12 @@ public boolean equals(Object o) { Objects.equals(this.int64, filterData.int64) && Objects.equals(this.uint64, filterData.uint64) && Objects.equals(this.float32, filterData.float32) && - Objects.equals(this.float64, filterData.float64)&& - Objects.equals(this.additionalProperties, filterData.additionalProperties); + Objects.equals(this.float64, filterData.float64); } @Override public int hashCode() { - return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64, additionalProperties); + return Objects.hash(int8, uint8, int16, uint16, int32, uint32, int64, uint64, float32, float64); } @Override @@ -370,7 +325,6 @@ public String toString() { sb.append(" uint64: ").append(toIndentedString(uint64)).append("\n"); sb.append(" float32: ").append(toIndentedString(float32)).append("\n"); sb.append(" float64: ").append(toIndentedString(float64)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -420,6 +374,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FilterData is not found in the empty JSON string", FilterData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!FilterData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `FilterData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); } @@ -438,28 +400,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FilterData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -467,28 +407,7 @@ else if (entry.getValue() instanceof Character) public FilterData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FilterData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FilterPipeline.java b/src/main/java/io/tiledb/cloud/rest_api/model/FilterPipeline.java index af18f4e..f61f437 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FilterPipeline.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FilterPipeline.java @@ -52,7 +52,7 @@ /** * One or more filters to apply */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FilterPipeline { public static final String SERIALIZED_NAME_FILTERS = "filters"; @SerializedName(SERIALIZED_NAME_FILTERS) @@ -87,50 +87,6 @@ public void setFilters(List filters) { this.filters = filters; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FilterPipeline instance itself - */ - public FilterPipeline putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } FilterPipeline filterPipeline = (FilterPipeline) o; - return Objects.equals(this.filters, filterPipeline.filters)&& - Objects.equals(this.additionalProperties, filterPipeline.additionalProperties); + return Objects.equals(this.filters, filterPipeline.filters); } @Override public int hashCode() { - return Objects.hash(filters, additionalProperties); + return Objects.hash(filters); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FilterPipeline {\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FilterPipeline is not found in the empty JSON string", FilterPipeline.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("filters") != null && !jsonObj.get("filters").isJsonNull()) { - JsonArray jsonArrayfilters = jsonObj.getAsJsonArray("filters"); - if (jsonArrayfilters != null) { - // ensure the json data is an array - if (!jsonObj.get("filters").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `filters` to be an array in the JSON string but got `%s`", jsonObj.get("filters").toString())); - } - - // validate the optional field `filters` (array) - for (int i = 0; i < jsonArrayfilters.size(); i++) { - Filter.validateJsonElement(jsonArrayfilters.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FilterPipeline value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public FilterPipeline read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FilterPipeline instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FilterType.java b/src/main/java/io/tiledb/cloud/rest_api/model/FilterType.java index bcd5a2a..f9225fc 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FilterType.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FilterType.java @@ -29,27 +29,27 @@ @JsonAdapter(FilterType.Adapter.class) public enum FilterType { - NONE("NONE"), + NONE("FILTER_NONE"), - GZIP("GZIP"), + GZIP("FILTER_GZIP"), - ZSTD("ZSTD"), + ZSTD("FILTER_ZSTD"), - LZ4("LZ4"), + LZ4("FILTER_LZ4"), - RLE("RLE"), + RLE("FILTER_RLE"), - BZIP2("BZIP2"), + BZIP2("FILTER_BZIP2"), - DOUBLE_DELTA("DOUBLE_DELTA"), + DOUBLE_DELTA("FILTER_DOUBLE_DELTA"), - BIT_WIDTH_REDUCTION("BIT_WIDTH_REDUCTION"), + BIT_WIDTH_REDUCTION("FILTER_BIT_WIDTH_REDUCTION"), - BITSHUFFLE("BITSHUFFLE"), + BITSHUFFLE("FILTER_BITSHUFFLE"), - BYTESHUFFLE("BYTESHUFFLE"), + BYTESHUFFLE("FILTER_BYTESHUFFLE"), - POSITIVE_DELTA("POSITIVE_DELTA"); + POSITIVE_DELTA("FILTER_POSITIVE_DELTA"); private String value; diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfo.java b/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfo.java index 13bdf74..57b5702 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfo.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfo.java @@ -55,7 +55,7 @@ /** * Fragment info of an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FragmentInfo { public static final String SERIALIZED_NAME_ARRAY_SCHEMA_ALL = "arraySchemaAll"; @SerializedName(SERIALIZED_NAME_ARRAY_SCHEMA_ALL) @@ -152,50 +152,6 @@ public void setToVacuum(List toVacuum) { this.toVacuum = toVacuum; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FragmentInfo instance itself - */ - public FragmentInfo putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -209,13 +165,12 @@ public boolean equals(Object o) { FragmentInfo fragmentInfo = (FragmentInfo) o; return Objects.equals(this.arraySchemaAll, fragmentInfo.arraySchemaAll) && Objects.equals(this.fragmentInfo, fragmentInfo.fragmentInfo) && - Objects.equals(this.toVacuum, fragmentInfo.toVacuum)&& - Objects.equals(this.additionalProperties, fragmentInfo.additionalProperties); + Objects.equals(this.toVacuum, fragmentInfo.toVacuum); } @Override public int hashCode() { - return Objects.hash(arraySchemaAll, fragmentInfo, toVacuum, additionalProperties); + return Objects.hash(arraySchemaAll, fragmentInfo, toVacuum); } @Override @@ -225,7 +180,6 @@ public String toString() { sb.append(" arraySchemaAll: ").append(toIndentedString(arraySchemaAll)).append("\n"); sb.append(" fragmentInfo: ").append(toIndentedString(fragmentInfo)).append("\n"); sb.append(" toVacuum: ").append(toIndentedString(toVacuum)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -268,25 +222,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FragmentInfo is not found in the empty JSON string", FragmentInfo.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("fragmentInfo") != null && !jsonObj.get("fragmentInfo").isJsonNull()) { - JsonArray jsonArrayfragmentInfo = jsonObj.getAsJsonArray("fragmentInfo"); - if (jsonArrayfragmentInfo != null) { - // ensure the json data is an array - if (!jsonObj.get("fragmentInfo").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `fragmentInfo` to be an array in the JSON string but got `%s`", jsonObj.get("fragmentInfo").toString())); - } - - // validate the optional field `fragmentInfo` (array) - for (int i = 0; i < jsonArrayfragmentInfo.size(); i++) { - SingleFragmentInfo.validateJsonElement(jsonArrayfragmentInfo.get(i)); - }; - } - } - // ensure the optional json data is an array if present - if (jsonObj.get("toVacuum") != null && !jsonObj.get("toVacuum").isJsonNull() && !jsonObj.get("toVacuum").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `toVacuum` to be an array in the JSON string but got `%s`", jsonObj.get("toVacuum").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -304,28 +239,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FragmentInfo value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -333,28 +246,7 @@ else if (entry.getValue() instanceof Character) public FragmentInfo read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FragmentInfo instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfoRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfoRequest.java index c637bdf..5e1a14d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfoRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FragmentInfoRequest.java @@ -50,7 +50,7 @@ /** * Fragment info request */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FragmentInfoRequest { public static final String SERIALIZED_NAME_CONFIG = "config"; @SerializedName(SERIALIZED_NAME_CONFIG) @@ -77,50 +77,6 @@ public void setConfig(TileDBConfig config) { this.config = config; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FragmentInfoRequest instance itself - */ - public FragmentInfoRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -132,13 +88,12 @@ public boolean equals(Object o) { return false; } FragmentInfoRequest fragmentInfoRequest = (FragmentInfoRequest) o; - return Objects.equals(this.config, fragmentInfoRequest.config)&& - Objects.equals(this.additionalProperties, fragmentInfoRequest.additionalProperties); + return Objects.equals(this.config, fragmentInfoRequest.config); } @Override public int hashCode() { - return Objects.hash(config, additionalProperties); + return Objects.hash(config); } @Override @@ -146,7 +101,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FragmentInfoRequest {\n"); sb.append(" config: ").append(toIndentedString(config)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -187,11 +141,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FragmentInfoRequest is not found in the empty JSON string", FragmentInfoRequest.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `config` - if (jsonObj.get("config") != null && !jsonObj.get("config").isJsonNull()) { - TileDBConfig.validateJsonElement(jsonObj.get("config")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -209,28 +158,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FragmentInfoRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -238,28 +165,7 @@ else if (entry.getValue() instanceof Character) public FragmentInfoRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FragmentInfoRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/FragmentMetadata.java b/src/main/java/io/tiledb/cloud/rest_api/model/FragmentMetadata.java index b96d249..40a9740 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/FragmentMetadata.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/FragmentMetadata.java @@ -51,7 +51,7 @@ /** * Fragment Metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class FragmentMetadata { public static final String SERIALIZED_NAME_FILE_SIZES = "fileSizes"; @SerializedName(SERIALIZED_NAME_FILE_SIZES) @@ -774,50 +774,6 @@ public void setLastTileCellNum(Integer lastTileCellNum) { this.lastTileCellNum = lastTileCellNum; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the FragmentMetadata instance itself - */ - public FragmentMetadata putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -853,13 +809,12 @@ public boolean equals(Object o) { Objects.equals(this.fragmentNullCounts, fragmentMetadata.fragmentNullCounts) && Objects.equals(this.version, fragmentMetadata.version) && Objects.equals(this.timestampRange, fragmentMetadata.timestampRange) && - Objects.equals(this.lastTileCellNum, fragmentMetadata.lastTileCellNum)&& - Objects.equals(this.additionalProperties, fragmentMetadata.additionalProperties); + Objects.equals(this.lastTileCellNum, fragmentMetadata.lastTileCellNum); } @Override public int hashCode() { - return Objects.hash(fileSizes, fileVarSizes, fileValiditySizes, fragmentUri, hasTimestamps, hasDeleteMeta, sparseTileNum, tileIndexBase, tileOffsets, tileVarOffsets, tileVarSizes, tileValidityOffsets, tileMinBuffer, tileMinVarBuffer, tileMaxBuffer, tileMaxVarBuffer, tileSums, tileNullCounts, fragmentMins, fragmentMaxs, fragmentSums, fragmentNullCounts, version, timestampRange, lastTileCellNum, additionalProperties); + return Objects.hash(fileSizes, fileVarSizes, fileValiditySizes, fragmentUri, hasTimestamps, hasDeleteMeta, sparseTileNum, tileIndexBase, tileOffsets, tileVarOffsets, tileVarSizes, tileValidityOffsets, tileMinBuffer, tileMinVarBuffer, tileMaxBuffer, tileMaxVarBuffer, tileSums, tileNullCounts, fragmentMins, fragmentMaxs, fragmentSums, fragmentNullCounts, version, timestampRange, lastTileCellNum); } @Override @@ -891,7 +846,6 @@ public String toString() { sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append(" timestampRange: ").append(toIndentedString(timestampRange)).append("\n"); sb.append(" lastTileCellNum: ").append(toIndentedString(lastTileCellNum)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -956,6 +910,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in FragmentMetadata is not found in the empty JSON string", FragmentMetadata.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!FragmentMetadata.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `FragmentMetadata` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("fileSizes") != null && !jsonObj.get("fileSizes").isJsonNull() && !jsonObj.get("fileSizes").isJsonArray()) { @@ -1049,28 +1011,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, FragmentMetadata value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -1078,28 +1018,7 @@ else if (entry.getValue() instanceof Character) public FragmentMetadata read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - FragmentMetadata instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GenericUDF.java b/src/main/java/io/tiledb/cloud/rest_api/model/GenericUDF.java index b5734de..6c01487 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GenericUDF.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GenericUDF.java @@ -53,7 +53,7 @@ /** * User-defined function */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GenericUDF { public static final String SERIALIZED_NAME_UDF_INFO_NAME = "udf_info_name"; @SerializedName(SERIALIZED_NAME_UDF_INFO_NAME) @@ -456,50 +456,6 @@ public void setClientNodeUuid(String clientNodeUuid) { this.clientNodeUuid = clientNodeUuid; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GenericUDF instance itself - */ - public GenericUDF putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -527,13 +483,12 @@ public boolean equals(Object o) { Objects.equals(this.timeout, genericUDF.timeout) && Objects.equals(this.dontDownloadResults, genericUDF.dontDownloadResults) && Objects.equals(this.taskGraphUuid, genericUDF.taskGraphUuid) && - Objects.equals(this.clientNodeUuid, genericUDF.clientNodeUuid)&& - Objects.equals(this.additionalProperties, genericUDF.additionalProperties); + Objects.equals(this.clientNodeUuid, genericUDF.clientNodeUuid); } @Override public int hashCode() { - return Objects.hash(udfInfoName, language, version, imageName, accessCredentialsName, resourceClass, exec, execRaw, argument, storedParamUuids, resultFormat, taskName, storeResults, timeout, dontDownloadResults, taskGraphUuid, clientNodeUuid, additionalProperties); + return Objects.hash(udfInfoName, language, version, imageName, accessCredentialsName, resourceClass, exec, execRaw, argument, storedParamUuids, resultFormat, taskName, storeResults, timeout, dontDownloadResults, taskGraphUuid, clientNodeUuid); } @Override @@ -557,7 +512,6 @@ public String toString() { sb.append(" dontDownloadResults: ").append(toIndentedString(dontDownloadResults)).append("\n"); sb.append(" taskGraphUuid: ").append(toIndentedString(taskGraphUuid)).append("\n"); sb.append(" clientNodeUuid: ").append(toIndentedString(clientNodeUuid)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -614,6 +568,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GenericUDF is not found in the empty JSON string", GenericUDF.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GenericUDF.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GenericUDF` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("udf_info_name") != null && !jsonObj.get("udf_info_name").isJsonNull()) && !jsonObj.get("udf_info_name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `udf_info_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("udf_info_name").toString())); @@ -677,28 +639,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GenericUDF value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -706,28 +646,7 @@ else if (entry.getValue() instanceof Character) public GenericUDF read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GenericUDF instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GetTiledbStats200Response.java b/src/main/java/io/tiledb/cloud/rest_api/model/GetTiledbStats200Response.java index 152ce3e..b720f83 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GetTiledbStats200Response.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GetTiledbStats200Response.java @@ -49,7 +49,7 @@ /** * GetTiledbStats200Response */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GetTiledbStats200Response { public static final String SERIALIZED_NAME_STATS = "stats"; @SerializedName(SERIALIZED_NAME_STATS) @@ -76,50 +76,6 @@ public void setStats(String stats) { this.stats = stats; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GetTiledbStats200Response instance itself - */ - public GetTiledbStats200Response putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -131,13 +87,12 @@ public boolean equals(Object o) { return false; } GetTiledbStats200Response getTiledbStats200Response = (GetTiledbStats200Response) o; - return Objects.equals(this.stats, getTiledbStats200Response.stats)&& - Objects.equals(this.additionalProperties, getTiledbStats200Response.additionalProperties); + return Objects.equals(this.stats, getTiledbStats200Response.stats); } @Override public int hashCode() { - return Objects.hash(stats, additionalProperties); + return Objects.hash(stats); } @Override @@ -145,7 +100,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class GetTiledbStats200Response {\n"); sb.append(" stats: ").append(toIndentedString(stats)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -186,6 +140,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GetTiledbStats200Response is not found in the empty JSON string", GetTiledbStats200Response.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GetTiledbStats200Response.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GetTiledbStats200Response` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("stats") != null && !jsonObj.get("stats").isJsonNull()) && !jsonObj.get("stats").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `stats` to be a primitive type in the JSON string but got `%s`", jsonObj.get("stats").toString())); @@ -207,28 +169,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GetTiledbStats200Response value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -236,28 +176,7 @@ else if (entry.getValue() instanceof Character) public GetTiledbStats200Response read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GetTiledbStats200Response instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivity.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivity.java index 2e121ce..ea72559 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivity.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivity.java @@ -209,7 +209,7 @@ public static void validateJsonObject(JsonObject jsonObj) throws IOException { } // validate the optional field `activity_log` if (jsonObj.get("activity_log") != null && !jsonObj.get("activity_log").isJsonNull()) { - ArrayActivityLog.validateJsonObject(jsonObj.getAsJsonObject("activity_log")); + ArrayActivityLog.validateJsonElement(jsonObj.getAsJsonObject("activity_log")); } } diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivityResponse.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivityResponse.java index 8cd3c58..c309669 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivityResponse.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupActivityResponse.java @@ -228,7 +228,7 @@ public static void validateJsonObject(JsonObject jsonObj) throws IOException { } // validate the optional field `pagination_metadata` if (jsonObj.get("pagination_metadata") != null && !jsonObj.get("pagination_metadata").isJsonNull()) { - PaginationMetadata.validateJsonObject(jsonObj.getAsJsonObject("pagination_metadata")); + PaginationMetadata.validateJsonElement(jsonObj.getAsJsonObject("pagination_metadata")); } } diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserData.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserData.java index 0d02f03..8f0cd28 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserData.java @@ -53,7 +53,7 @@ /** * Object including group info and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupBrowserData { public static final String SERIALIZED_NAME_GROUPS = "groups"; @SerializedName(SERIALIZED_NAME_GROUPS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupBrowserData instance itself - */ - public GroupBrowserData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } GroupBrowserData groupBrowserData = (GroupBrowserData) o; return Objects.equals(this.groups, groupBrowserData.groups) && - Objects.equals(this.paginationMetadata, groupBrowserData.paginationMetadata)&& - Objects.equals(this.additionalProperties, groupBrowserData.additionalProperties); + Objects.equals(this.paginationMetadata, groupBrowserData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(groups, paginationMetadata, additionalProperties); + return Objects.hash(groups, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class GroupBrowserData {\n"); sb.append(" groups: ").append(toIndentedString(groups)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupBrowserData is not found in the empty JSON string", GroupBrowserData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupBrowserData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupBrowserData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("groups") != null && !jsonObj.get("groups").isJsonNull()) { JsonArray jsonArraygroups = jsonObj.getAsJsonArray("groups"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupBrowserData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public GroupBrowserData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupBrowserData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserFilterData.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserFilterData.java index e63ca9d..a09b37e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserFilterData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupBrowserFilterData.java @@ -52,7 +52,7 @@ /** * Object with data to fill browser filter */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupBrowserFilterData { public static final String SERIALIZED_NAME_NAMESPACES = "namespaces"; @SerializedName(SERIALIZED_NAME_NAMESPACES) @@ -118,50 +118,6 @@ public void setGroupTypes(List groupTypes) { this.groupTypes = groupTypes; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupBrowserFilterData instance itself - */ - public GroupBrowserFilterData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -174,13 +130,12 @@ public boolean equals(Object o) { } GroupBrowserFilterData groupBrowserFilterData = (GroupBrowserFilterData) o; return Objects.equals(this.namespaces, groupBrowserFilterData.namespaces) && - Objects.equals(this.groupTypes, groupBrowserFilterData.groupTypes)&& - Objects.equals(this.additionalProperties, groupBrowserFilterData.additionalProperties); + Objects.equals(this.groupTypes, groupBrowserFilterData.groupTypes); } @Override public int hashCode() { - return Objects.hash(namespaces, groupTypes, additionalProperties); + return Objects.hash(namespaces, groupTypes); } @Override @@ -189,7 +144,6 @@ public String toString() { sb.append("class GroupBrowserFilterData {\n"); sb.append(" namespaces: ").append(toIndentedString(namespaces)).append("\n"); sb.append(" groupTypes: ").append(toIndentedString(groupTypes)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -231,6 +185,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupBrowserFilterData is not found in the empty JSON string", GroupBrowserFilterData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupBrowserFilterData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupBrowserFilterData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("namespaces") != null && !jsonObj.get("namespaces").isJsonNull() && !jsonObj.get("namespaces").isJsonArray()) { @@ -257,28 +219,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupBrowserFilterData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -286,28 +226,7 @@ else if (entry.getValue() instanceof Character) public GroupBrowserFilterData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupBrowserFilterData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupChanges.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupChanges.java index eb9013d..521e4b1 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupChanges.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupChanges.java @@ -52,7 +52,7 @@ /** * A request to change the members of a group. Contains assets to add or remove. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupChanges { public static final String SERIALIZED_NAME_ADD = "add"; @SerializedName(SERIALIZED_NAME_ADD) @@ -118,50 +118,6 @@ public void setRemove(List remove) { this.remove = remove; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupChanges instance itself - */ - public GroupChanges putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -174,13 +130,12 @@ public boolean equals(Object o) { } GroupChanges groupChanges = (GroupChanges) o; return Objects.equals(this.add, groupChanges.add) && - Objects.equals(this.remove, groupChanges.remove)&& - Objects.equals(this.additionalProperties, groupChanges.additionalProperties); + Objects.equals(this.remove, groupChanges.remove); } @Override public int hashCode() { - return Objects.hash(add, remove, additionalProperties); + return Objects.hash(add, remove); } @Override @@ -189,7 +144,6 @@ public String toString() { sb.append("class GroupChanges {\n"); sb.append(" add: ").append(toIndentedString(add)).append("\n"); sb.append(" remove: ").append(toIndentedString(remove)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -231,35 +185,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupChanges is not found in the empty JSON string", GroupChanges.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("add") != null && !jsonObj.get("add").isJsonNull()) { - JsonArray jsonArrayadd = jsonObj.getAsJsonArray("add"); - if (jsonArrayadd != null) { - // ensure the json data is an array - if (!jsonObj.get("add").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `add` to be an array in the JSON string but got `%s`", jsonObj.get("add").toString())); - } - - // validate the optional field `add` (array) - for (int i = 0; i < jsonArrayadd.size(); i++) { - GroupMember.validateJsonElement(jsonArrayadd.get(i)); - }; - } - } - if (jsonObj.get("remove") != null && !jsonObj.get("remove").isJsonNull()) { - JsonArray jsonArrayremove = jsonObj.getAsJsonArray("remove"); - if (jsonArrayremove != null) { - // ensure the json data is an array - if (!jsonObj.get("remove").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `remove` to be an array in the JSON string but got `%s`", jsonObj.get("remove").toString())); - } - - // validate the optional field `remove` (array) - for (int i = 0; i < jsonArrayremove.size(); i++) { - GroupMember.validateJsonElement(jsonArrayremove.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -277,28 +202,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupChanges value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -306,28 +209,7 @@ else if (entry.getValue() instanceof Character) public GroupChanges read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupChanges instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivity.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivity.java index efd9dae..99b88d2 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivity.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivity.java @@ -51,7 +51,7 @@ /** * Object containing activity of an asset of a group */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupContentActivity { public static final String SERIALIZED_NAME_ASSET = "asset"; @SerializedName(SERIALIZED_NAME_ASSET) @@ -101,50 +101,6 @@ public void setActivityLog(ArrayActivityLog activityLog) { this.activityLog = activityLog; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupContentActivity instance itself - */ - public GroupContentActivity putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -157,13 +113,12 @@ public boolean equals(Object o) { } GroupContentActivity groupContentActivity = (GroupContentActivity) o; return Objects.equals(this.asset, groupContentActivity.asset) && - Objects.equals(this.activityLog, groupContentActivity.activityLog)&& - Objects.equals(this.additionalProperties, groupContentActivity.additionalProperties); + Objects.equals(this.activityLog, groupContentActivity.activityLog); } @Override public int hashCode() { - return Objects.hash(asset, activityLog, additionalProperties); + return Objects.hash(asset, activityLog); } @Override @@ -172,7 +127,6 @@ public String toString() { sb.append("class GroupContentActivity {\n"); sb.append(" asset: ").append(toIndentedString(asset)).append("\n"); sb.append(" activityLog: ").append(toIndentedString(activityLog)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -214,15 +168,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupContentActivity is not found in the empty JSON string", GroupContentActivity.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `asset` - if (jsonObj.get("asset") != null && !jsonObj.get("asset").isJsonNull()) { - GroupContentActivityAsset.validateJsonElement(jsonObj.get("asset")); - } - // validate the optional field `activity_log` - if (jsonObj.get("activity_log") != null && !jsonObj.get("activity_log").isJsonNull()) { - ArrayActivityLog.validateJsonElement(jsonObj.get("activity_log")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -240,28 +185,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupContentActivity value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -269,28 +192,7 @@ else if (entry.getValue() instanceof Character) public GroupContentActivity read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupContentActivity instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityAsset.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityAsset.java index d2e0cfc..5e5c7fa 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityAsset.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityAsset.java @@ -50,7 +50,7 @@ /** * The asset details */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupContentActivityAsset { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -146,50 +146,6 @@ public void setAssetType(AssetType assetType) { this.assetType = assetType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupContentActivityAsset instance itself - */ - public GroupContentActivityAsset putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -204,13 +160,12 @@ public boolean equals(Object o) { return Objects.equals(this.id, groupContentActivityAsset.id) && Objects.equals(this.name, groupContentActivityAsset.name) && Objects.equals(this.namespace, groupContentActivityAsset.namespace) && - Objects.equals(this.assetType, groupContentActivityAsset.assetType)&& - Objects.equals(this.additionalProperties, groupContentActivityAsset.additionalProperties); + Objects.equals(this.assetType, groupContentActivityAsset.assetType); } @Override public int hashCode() { - return Objects.hash(id, name, namespace, assetType, additionalProperties); + return Objects.hash(id, name, namespace, assetType); } @Override @@ -221,7 +176,6 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" assetType: ").append(toIndentedString(assetType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,20 +219,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupContentActivityAsset is not found in the empty JSON string", GroupContentActivityAsset.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - // validate the optional field `asset_type` - if (jsonObj.get("asset_type") != null && !jsonObj.get("asset_type").isJsonNull()) { - AssetType.validateJsonElement(jsonObj.get("asset_type")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -296,28 +236,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupContentActivityAsset value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -325,28 +243,7 @@ else if (entry.getValue() instanceof Character) public GroupContentActivityAsset read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupContentActivityAsset instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityResponse.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityResponse.java index a81089e..ca9d66c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityResponse.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentActivityResponse.java @@ -53,7 +53,7 @@ /** * Object containing activity logs of group content along with the pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupContentActivityResponse { public static final String SERIALIZED_NAME_ACTIVITY = "activity"; @SerializedName(SERIALIZED_NAME_ACTIVITY) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupContentActivityResponse instance itself - */ - public GroupContentActivityResponse putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } GroupContentActivityResponse groupContentActivityResponse = (GroupContentActivityResponse) o; return Objects.equals(this.activity, groupContentActivityResponse.activity) && - Objects.equals(this.paginationMetadata, groupContentActivityResponse.paginationMetadata)&& - Objects.equals(this.additionalProperties, groupContentActivityResponse.additionalProperties); + Objects.equals(this.paginationMetadata, groupContentActivityResponse.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(activity, paginationMetadata, additionalProperties); + return Objects.hash(activity, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class GroupContentActivityResponse {\n"); sb.append(" activity: ").append(toIndentedString(activity)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,25 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupContentActivityResponse is not found in the empty JSON string", GroupContentActivityResponse.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("activity") != null && !jsonObj.get("activity").isJsonNull()) { - JsonArray jsonArrayactivity = jsonObj.getAsJsonArray("activity"); - if (jsonArrayactivity != null) { - // ensure the json data is an array - if (!jsonObj.get("activity").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `activity` to be an array in the JSON string but got `%s`", jsonObj.get("activity").toString())); - } - - // validate the optional field `activity` (array) - for (int i = 0; i < jsonArrayactivity.size(); i++) { - GroupContentActivity.validateJsonElement(jsonArrayactivity.get(i)); - }; - } - } - // validate the optional field `pagination_metadata` - if (jsonObj.get("pagination_metadata") != null && !jsonObj.get("pagination_metadata").isJsonNull()) { - PaginationMetadata.validateJsonElement(jsonObj.get("pagination_metadata")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -260,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupContentActivityResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +202,7 @@ else if (entry.getValue() instanceof Character) public GroupContentActivityResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupContentActivityResponse instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContents.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContents.java index 3dc72ab..ca914e3 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContents.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContents.java @@ -53,7 +53,7 @@ /** * Object including a page of members of a group and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupContents { public static final String SERIALIZED_NAME_ENTRIES = "entries"; @SerializedName(SERIALIZED_NAME_ENTRIES) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupContents instance itself - */ - public GroupContents putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } GroupContents groupContents = (GroupContents) o; return Objects.equals(this.entries, groupContents.entries) && - Objects.equals(this.paginationMetadata, groupContents.paginationMetadata)&& - Objects.equals(this.additionalProperties, groupContents.additionalProperties); + Objects.equals(this.paginationMetadata, groupContents.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(entries, paginationMetadata, additionalProperties); + return Objects.hash(entries, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class GroupContents {\n"); sb.append(" entries: ").append(toIndentedString(entries)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,25 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupContents is not found in the empty JSON string", GroupContents.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("entries") != null && !jsonObj.get("entries").isJsonNull()) { - JsonArray jsonArrayentries = jsonObj.getAsJsonArray("entries"); - if (jsonArrayentries != null) { - // ensure the json data is an array - if (!jsonObj.get("entries").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `entries` to be an array in the JSON string but got `%s`", jsonObj.get("entries").toString())); - } - - // validate the optional field `entries` (array) - for (int i = 0; i < jsonArrayentries.size(); i++) { - GroupEntry.validateJsonElement(jsonArrayentries.get(i)); - }; - } - } - // validate the optional field `pagination_metadata` - if (jsonObj.get("pagination_metadata") != null && !jsonObj.get("pagination_metadata").isJsonNull()) { - PaginationMetadata.validateJsonElement(jsonObj.get("pagination_metadata")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -260,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupContents value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +202,7 @@ else if (entry.getValue() instanceof Character) public GroupContents read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupContents instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentsFilterData.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentsFilterData.java index add6d17..a601223 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentsFilterData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupContentsFilterData.java @@ -51,7 +51,7 @@ /** * Object with data to fill contents filter */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupContentsFilterData { public static final String SERIALIZED_NAME_NAMESPACES = "namespaces"; @SerializedName(SERIALIZED_NAME_NAMESPACES) @@ -86,50 +86,6 @@ public void setNamespaces(List namespaces) { this.namespaces = namespaces; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupContentsFilterData instance itself - */ - public GroupContentsFilterData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -141,13 +97,12 @@ public boolean equals(Object o) { return false; } GroupContentsFilterData groupContentsFilterData = (GroupContentsFilterData) o; - return Objects.equals(this.namespaces, groupContentsFilterData.namespaces)&& - Objects.equals(this.additionalProperties, groupContentsFilterData.additionalProperties); + return Objects.equals(this.namespaces, groupContentsFilterData.namespaces); } @Override public int hashCode() { - return Objects.hash(namespaces, additionalProperties); + return Objects.hash(namespaces); } @Override @@ -155,7 +110,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class GroupContentsFilterData {\n"); sb.append(" namespaces: ").append(toIndentedString(namespaces)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -196,6 +150,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupContentsFilterData is not found in the empty JSON string", GroupContentsFilterData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupContentsFilterData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupContentsFilterData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("namespaces") != null && !jsonObj.get("namespaces").isJsonNull() && !jsonObj.get("namespaces").isJsonArray()) { @@ -218,28 +180,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupContentsFilterData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -247,28 +187,7 @@ else if (entry.getValue() instanceof Character) public GroupContentsFilterData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupContentsFilterData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupCreate.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupCreate.java index e590254..c9ae5e5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupCreate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupCreate.java @@ -51,7 +51,7 @@ /** * Initial attributes for the creation of a group. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupCreate { public static final String SERIALIZED_NAME_DESCRIPTION = "description"; @SerializedName(SERIALIZED_NAME_DESCRIPTION) @@ -270,50 +270,6 @@ public void setLicenseText(String licenseText) { this.licenseText = licenseText; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupCreate instance itself - */ - public GroupCreate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -333,13 +289,12 @@ public boolean equals(Object o) { Objects.equals(this.accessCredentialsName, groupCreate.accessCredentialsName) && Objects.equals(this.tags, groupCreate.tags) && Objects.equals(this.licenseId, groupCreate.licenseId) && - Objects.equals(this.licenseText, groupCreate.licenseText)&& - Objects.equals(this.additionalProperties, groupCreate.additionalProperties); + Objects.equals(this.licenseText, groupCreate.licenseText); } @Override public int hashCode() { - return Objects.hash(description, name, parent, uri, logo, accessCredentialsName, tags, licenseId, licenseText, additionalProperties); + return Objects.hash(description, name, parent, uri, logo, accessCredentialsName, tags, licenseId, licenseText); } @Override @@ -355,7 +310,6 @@ public String toString() { sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n"); sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -404,35 +358,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupCreate is not found in the empty JSON string", GroupCreate.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("description") != null && !jsonObj.get("description").isJsonNull()) && !jsonObj.get("description").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("parent") != null && !jsonObj.get("parent").isJsonNull()) && !jsonObj.get("parent").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `parent` to be a primitive type in the JSON string but got `%s`", jsonObj.get("parent").toString())); - } - if ((jsonObj.get("uri") != null && !jsonObj.get("uri").isJsonNull()) && !jsonObj.get("uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uri").toString())); - } - if ((jsonObj.get("logo") != null && !jsonObj.get("logo").isJsonNull()) && !jsonObj.get("logo").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logo` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logo").toString())); - } - if ((jsonObj.get("access_credentials_name") != null && !jsonObj.get("access_credentials_name").isJsonNull()) && !jsonObj.get("access_credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `access_credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("access_credentials_name").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("tags") != null && !jsonObj.get("tags").isJsonNull() && !jsonObj.get("tags").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `tags` to be an array in the JSON string but got `%s`", jsonObj.get("tags").toString())); - } - if ((jsonObj.get("license_id") != null && !jsonObj.get("license_id").isJsonNull()) && !jsonObj.get("license_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_id").toString())); - } - if ((jsonObj.get("license_text") != null && !jsonObj.get("license_text").isJsonNull()) && !jsonObj.get("license_text").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_text` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_text").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -450,28 +375,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupCreate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -479,28 +382,7 @@ else if (entry.getValue() instanceof Character) public GroupCreate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupCreate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupEntry.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupEntry.java index b67782d..06c86e8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupEntry.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupEntry.java @@ -51,7 +51,7 @@ /** * Object describing a single member of a group, which can be an array or a group */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupEntry { public static final String SERIALIZED_NAME_MEMBER_ID = "member_id"; @SerializedName(SERIALIZED_NAME_MEMBER_ID) @@ -123,50 +123,6 @@ public void setArray(ArrayInfo array) { this.array = array; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupEntry instance itself - */ - public GroupEntry putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -180,13 +136,12 @@ public boolean equals(Object o) { GroupEntry groupEntry = (GroupEntry) o; return Objects.equals(this.memberId, groupEntry.memberId) && Objects.equals(this.group, groupEntry.group) && - Objects.equals(this.array, groupEntry.array)&& - Objects.equals(this.additionalProperties, groupEntry.additionalProperties); + Objects.equals(this.array, groupEntry.array); } @Override public int hashCode() { - return Objects.hash(memberId, group, array, additionalProperties); + return Objects.hash(memberId, group, array); } @Override @@ -196,7 +151,6 @@ public String toString() { sb.append(" memberId: ").append(toIndentedString(memberId)).append("\n"); sb.append(" group: ").append(toIndentedString(group)).append("\n"); sb.append(" array: ").append(toIndentedString(array)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -239,18 +193,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupEntry is not found in the empty JSON string", GroupEntry.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("member_id") != null && !jsonObj.get("member_id").isJsonNull()) && !jsonObj.get("member_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `member_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("member_id").toString())); - } - // validate the optional field `group` - if (jsonObj.get("group") != null && !jsonObj.get("group").isJsonNull()) { - GroupInfo.validateJsonElement(jsonObj.get("group")); - } - // validate the optional field `array` - if (jsonObj.get("array") != null && !jsonObj.get("array").isJsonNull()) { - ArrayInfo.validateJsonElement(jsonObj.get("array")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -268,28 +210,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupEntry value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -297,28 +217,7 @@ else if (entry.getValue() instanceof Character) public GroupEntry read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupEntry instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupInfo.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupInfo.java index 2ba7132..ac7011e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupInfo.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupInfo.java @@ -57,7 +57,7 @@ /** * metadata of a group */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupInfo { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -591,50 +591,6 @@ public void setMetadata(List metadata) { this.metadata = metadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupInfo instance itself - */ - public GroupInfo putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -667,8 +623,7 @@ public boolean equals(Object o) { Objects.equals(this.licenseText, groupInfo.licenseText) && Objects.equals(this.createdAt, groupInfo.createdAt) && Objects.equals(this.createdBy, groupInfo.createdBy) && - Objects.equals(this.metadata, groupInfo.metadata)&& - Objects.equals(this.additionalProperties, groupInfo.additionalProperties); + Objects.equals(this.metadata, groupInfo.metadata); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -677,7 +632,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, namespace, name, description, uri, tiledbUri, assetCount, groupCount, size, lastAccessed, allowedActions, groupType, logo, accessCredentialsName, shareCount, publicShare, tags, licenseId, licenseText, createdAt, createdBy, metadata, additionalProperties); + return Objects.hash(id, namespace, name, description, uri, tiledbUri, assetCount, groupCount, size, lastAccessed, allowedActions, groupType, logo, accessCredentialsName, shareCount, publicShare, tags, licenseId, licenseText, createdAt, createdBy, metadata); } private static int hashCodeNullable(JsonNullable a) { @@ -713,7 +668,6 @@ public String toString() { sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append(" createdBy: ").append(toIndentedString(createdBy)).append("\n"); sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -775,6 +729,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupInfo is not found in the empty JSON string", GroupInfo.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupInfo.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupInfo` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); @@ -852,28 +814,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupInfo value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -881,28 +821,7 @@ else if (entry.getValue() instanceof Character) public GroupInfo read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupInfo instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupMember.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupMember.java index 1b0baed..060cde5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupMember.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupMember.java @@ -50,7 +50,7 @@ /** * A groups member, array or another groups, to add or remove from an existing group. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupMember { public static final String SERIALIZED_NAME_NAMESPACE = "namespace"; @SerializedName(SERIALIZED_NAME_NAMESPACE) @@ -123,50 +123,6 @@ public void setMemberType(GroupMemberType memberType) { this.memberType = memberType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupMember instance itself - */ - public GroupMember putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -180,13 +136,12 @@ public boolean equals(Object o) { GroupMember groupMember = (GroupMember) o; return Objects.equals(this.namespace, groupMember.namespace) && Objects.equals(this.name, groupMember.name) && - Objects.equals(this.memberType, groupMember.memberType)&& - Objects.equals(this.additionalProperties, groupMember.additionalProperties); + Objects.equals(this.memberType, groupMember.memberType); } @Override public int hashCode() { - return Objects.hash(namespace, name, memberType, additionalProperties); + return Objects.hash(namespace, name, memberType); } @Override @@ -196,7 +151,6 @@ public String toString() { sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" memberType: ").append(toIndentedString(memberType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -239,6 +193,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupMember is not found in the empty JSON string", GroupMember.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupMember.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupMember` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); @@ -267,28 +229,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupMember value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -296,28 +236,7 @@ else if (entry.getValue() instanceof Character) public GroupMember read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupMember instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupRegister.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupRegister.java index 30343ef..333ff51 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupRegister.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupRegister.java @@ -51,7 +51,7 @@ /** * Initial attributes for the registration of a an existing group. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupRegister { public static final String SERIALIZED_NAME_DESCRIPTION = "description"; @SerializedName(SERIALIZED_NAME_DESCRIPTION) @@ -270,50 +270,6 @@ public void setLicenseText(String licenseText) { this.licenseText = licenseText; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupRegister instance itself - */ - public GroupRegister putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -333,13 +289,12 @@ public boolean equals(Object o) { Objects.equals(this.accessCredentialsName, groupRegister.accessCredentialsName) && Objects.equals(this.tags, groupRegister.tags) && Objects.equals(this.licenseId, groupRegister.licenseId) && - Objects.equals(this.licenseText, groupRegister.licenseText)&& - Objects.equals(this.additionalProperties, groupRegister.additionalProperties); + Objects.equals(this.licenseText, groupRegister.licenseText); } @Override public int hashCode() { - return Objects.hash(description, name, parent, uri, logo, accessCredentialsName, tags, licenseId, licenseText, additionalProperties); + return Objects.hash(description, name, parent, uri, logo, accessCredentialsName, tags, licenseId, licenseText); } @Override @@ -355,7 +310,6 @@ public String toString() { sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n"); sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -404,35 +358,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupRegister is not found in the empty JSON string", GroupRegister.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("description") != null && !jsonObj.get("description").isJsonNull()) && !jsonObj.get("description").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("parent") != null && !jsonObj.get("parent").isJsonNull()) && !jsonObj.get("parent").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `parent` to be a primitive type in the JSON string but got `%s`", jsonObj.get("parent").toString())); - } - if ((jsonObj.get("uri") != null && !jsonObj.get("uri").isJsonNull()) && !jsonObj.get("uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uri").toString())); - } - if ((jsonObj.get("logo") != null && !jsonObj.get("logo").isJsonNull()) && !jsonObj.get("logo").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logo` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logo").toString())); - } - if ((jsonObj.get("access_credentials_name") != null && !jsonObj.get("access_credentials_name").isJsonNull()) && !jsonObj.get("access_credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `access_credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("access_credentials_name").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("tags") != null && !jsonObj.get("tags").isJsonNull() && !jsonObj.get("tags").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `tags` to be an array in the JSON string but got `%s`", jsonObj.get("tags").toString())); - } - if ((jsonObj.get("license_id") != null && !jsonObj.get("license_id").isJsonNull()) && !jsonObj.get("license_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_id").toString())); - } - if ((jsonObj.get("license_text") != null && !jsonObj.get("license_text").isJsonNull()) && !jsonObj.get("license_text").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_text` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_text").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -450,28 +375,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupRegister value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -479,28 +382,7 @@ else if (entry.getValue() instanceof Character) public GroupRegister read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupRegister instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharing.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharing.java index 7007e5b..91d7fa8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharing.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharing.java @@ -53,7 +53,7 @@ /** * sharing state of a group with a namespace */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupSharing { public static final String SERIALIZED_NAME_GROUP_ACTIONS = "group_actions"; @SerializedName(SERIALIZED_NAME_GROUP_ACTIONS) @@ -165,50 +165,6 @@ public void setNamespaceType(String namespaceType) { this.namespaceType = namespaceType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupSharing instance itself - */ - public GroupSharing putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -223,13 +179,12 @@ public boolean equals(Object o) { return Objects.equals(this.groupActions, groupSharing.groupActions) && Objects.equals(this.arrayActions, groupSharing.arrayActions) && Objects.equals(this.namespace, groupSharing.namespace) && - Objects.equals(this.namespaceType, groupSharing.namespaceType)&& - Objects.equals(this.additionalProperties, groupSharing.additionalProperties); + Objects.equals(this.namespaceType, groupSharing.namespaceType); } @Override public int hashCode() { - return Objects.hash(groupActions, arrayActions, namespace, namespaceType, additionalProperties); + return Objects.hash(groupActions, arrayActions, namespace, namespaceType); } @Override @@ -240,7 +195,6 @@ public String toString() { sb.append(" arrayActions: ").append(toIndentedString(arrayActions)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" namespaceType: ").append(toIndentedString(namespaceType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -284,6 +238,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupSharing is not found in the empty JSON string", GroupSharing.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupSharing.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupSharing` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("group_actions") != null && !jsonObj.get("group_actions").isJsonNull() && !jsonObj.get("group_actions").isJsonArray()) { @@ -316,28 +278,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupSharing value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -345,28 +285,7 @@ else if (entry.getValue() instanceof Character) public GroupSharing read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupSharing instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharingRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharingRequest.java index 2c30412..cae3904 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharingRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupSharingRequest.java @@ -53,7 +53,7 @@ /** * a request to share a group and all the contents with a namespace */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupSharingRequest { public static final String SERIALIZED_NAME_GROUP_ACTIONS = "group_actions"; @SerializedName(SERIALIZED_NAME_GROUP_ACTIONS) @@ -142,50 +142,6 @@ public void setNamespace(String namespace) { this.namespace = namespace; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupSharingRequest instance itself - */ - public GroupSharingRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -199,13 +155,12 @@ public boolean equals(Object o) { GroupSharingRequest groupSharingRequest = (GroupSharingRequest) o; return Objects.equals(this.groupActions, groupSharingRequest.groupActions) && Objects.equals(this.arrayActions, groupSharingRequest.arrayActions) && - Objects.equals(this.namespace, groupSharingRequest.namespace)&& - Objects.equals(this.additionalProperties, groupSharingRequest.additionalProperties); + Objects.equals(this.namespace, groupSharingRequest.namespace); } @Override public int hashCode() { - return Objects.hash(groupActions, arrayActions, namespace, additionalProperties); + return Objects.hash(groupActions, arrayActions, namespace); } @Override @@ -215,7 +170,6 @@ public String toString() { sb.append(" groupActions: ").append(toIndentedString(groupActions)).append("\n"); sb.append(" arrayActions: ").append(toIndentedString(arrayActions)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -258,6 +212,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupSharingRequest is not found in the empty JSON string", GroupSharingRequest.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!GroupSharingRequest.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `GroupSharingRequest` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("group_actions") != null && !jsonObj.get("group_actions").isJsonNull() && !jsonObj.get("group_actions").isJsonArray()) { @@ -287,28 +249,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupSharingRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -316,28 +256,7 @@ else if (entry.getValue() instanceof Character) public GroupSharingRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupSharingRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/GroupUpdate.java b/src/main/java/io/tiledb/cloud/rest_api/model/GroupUpdate.java index fbb278d..819e7c3 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/GroupUpdate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/GroupUpdate.java @@ -52,7 +52,7 @@ /** * Updates for a group. New values for the attributes. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class GroupUpdate { public static final String SERIALIZED_NAME_DESCRIPTION = "description"; @SerializedName(SERIALIZED_NAME_DESCRIPTION) @@ -225,50 +225,6 @@ public void setLicenseText(String licenseText) { this.licenseText = licenseText; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the GroupUpdate instance itself - */ - public GroupUpdate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -286,8 +242,7 @@ public boolean equals(Object o) { Objects.equals(this.accessCredentialsName, groupUpdate.accessCredentialsName) && Objects.equals(this.tags, groupUpdate.tags) && Objects.equals(this.licenseId, groupUpdate.licenseId) && - Objects.equals(this.licenseText, groupUpdate.licenseText)&& - Objects.equals(this.additionalProperties, groupUpdate.additionalProperties); + Objects.equals(this.licenseText, groupUpdate.licenseText); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -296,7 +251,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(description, name, logo, accessCredentialsName, tags, licenseId, licenseText, additionalProperties); + return Objects.hash(description, name, logo, accessCredentialsName, tags, licenseId, licenseText); } private static int hashCodeNullable(JsonNullable a) { @@ -317,7 +272,6 @@ public String toString() { sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n"); sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -364,29 +318,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in GroupUpdate is not found in the empty JSON string", GroupUpdate.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("description") != null && !jsonObj.get("description").isJsonNull()) && !jsonObj.get("description").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("logo") != null && !jsonObj.get("logo").isJsonNull()) && !jsonObj.get("logo").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logo` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logo").toString())); - } - if ((jsonObj.get("access_credentials_name") != null && !jsonObj.get("access_credentials_name").isJsonNull()) && !jsonObj.get("access_credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `access_credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("access_credentials_name").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("tags") != null && !jsonObj.get("tags").isJsonNull() && !jsonObj.get("tags").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `tags` to be an array in the JSON string but got `%s`", jsonObj.get("tags").toString())); - } - if ((jsonObj.get("license_id") != null && !jsonObj.get("license_id").isJsonNull()) && !jsonObj.get("license_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_id").toString())); - } - if ((jsonObj.get("license_text") != null && !jsonObj.get("license_text").isJsonNull()) && !jsonObj.get("license_text").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_text` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_text").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -404,28 +335,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, GroupUpdate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -433,28 +342,7 @@ else if (entry.getValue() instanceof Character) public GroupUpdate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - GroupUpdate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Invitation.java b/src/main/java/io/tiledb/cloud/rest_api/model/Invitation.java index 981072a..d822cc4 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Invitation.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Invitation.java @@ -53,7 +53,7 @@ /** * Invitations to share or collaborate */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Invitation { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -517,50 +517,6 @@ public void setNamespaceInvited(String namespaceInvited) { this.namespaceInvited = namespaceInvited; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Invitation instance itself - */ - public Invitation putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -591,13 +547,12 @@ public boolean equals(Object o) { Objects.equals(this.createdAt, invitation.createdAt) && Objects.equals(this.expiresAt, invitation.expiresAt) && Objects.equals(this.acceptedAt, invitation.acceptedAt) && - Objects.equals(this.namespaceInvited, invitation.namespaceInvited)&& - Objects.equals(this.additionalProperties, invitation.additionalProperties); + Objects.equals(this.namespaceInvited, invitation.namespaceInvited); } @Override public int hashCode() { - return Objects.hash(id, invitationType, ownerNamespaceUuid, inviterUuid, userNamespaceUuid, organizationUserUuid, organizationName, organizationRole, organizationUuid, arrayUuid, groupUuid, arrayName, email, actions, groupActions, status, createdAt, expiresAt, acceptedAt, namespaceInvited, additionalProperties); + return Objects.hash(id, invitationType, ownerNamespaceUuid, inviterUuid, userNamespaceUuid, organizationUserUuid, organizationName, organizationRole, organizationUuid, arrayUuid, groupUuid, arrayName, email, actions, groupActions, status, createdAt, expiresAt, acceptedAt, namespaceInvited); } @Override @@ -624,7 +579,6 @@ public String toString() { sb.append(" expiresAt: ").append(toIndentedString(expiresAt)).append("\n"); sb.append(" acceptedAt: ").append(toIndentedString(acceptedAt)).append("\n"); sb.append(" namespaceInvited: ").append(toIndentedString(namespaceInvited)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -684,6 +638,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Invitation is not found in the empty JSON string", Invitation.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Invitation.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Invitation` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); @@ -756,28 +718,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Invitation value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -785,28 +725,7 @@ else if (entry.getValue() instanceof Character) public Invitation read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Invitation instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationArrayShareEmail.java b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationArrayShareEmail.java index 015a7c2..315c44c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationArrayShareEmail.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationArrayShareEmail.java @@ -52,7 +52,7 @@ /** * Encapsulates information regarding inviting people using email to share array, same permissions for all invitees */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class InvitationArrayShareEmail { public static final String SERIALIZED_NAME_ACTIONS = "actions"; @SerializedName(SERIALIZED_NAME_ACTIONS) @@ -118,50 +118,6 @@ public void setInviteeEmail(List inviteeEmail) { this.inviteeEmail = inviteeEmail; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the InvitationArrayShareEmail instance itself - */ - public InvitationArrayShareEmail putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -174,13 +130,12 @@ public boolean equals(Object o) { } InvitationArrayShareEmail invitationArrayShareEmail = (InvitationArrayShareEmail) o; return Objects.equals(this.actions, invitationArrayShareEmail.actions) && - Objects.equals(this.inviteeEmail, invitationArrayShareEmail.inviteeEmail)&& - Objects.equals(this.additionalProperties, invitationArrayShareEmail.additionalProperties); + Objects.equals(this.inviteeEmail, invitationArrayShareEmail.inviteeEmail); } @Override public int hashCode() { - return Objects.hash(actions, inviteeEmail, additionalProperties); + return Objects.hash(actions, inviteeEmail); } @Override @@ -189,7 +144,6 @@ public String toString() { sb.append("class InvitationArrayShareEmail {\n"); sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" inviteeEmail: ").append(toIndentedString(inviteeEmail)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -233,26 +187,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in InvitationArrayShareEmail is not found in the empty JSON string", InvitationArrayShareEmail.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : InvitationArrayShareEmail.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the required json array is present - if (jsonObj.get("actions") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `actions` to be an array in the JSON string but got `%s`", jsonObj.get("actions").toString())); - } - // ensure the required json array is present - if (jsonObj.get("invitee_email") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("invitee_email").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `invitee_email` to be an array in the JSON string but got `%s`", jsonObj.get("invitee_email").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -270,28 +204,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, InvitationArrayShareEmail value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -299,28 +211,7 @@ else if (entry.getValue() instanceof Character) public InvitationArrayShareEmail read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - InvitationArrayShareEmail instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationData.java b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationData.java index 1fa7f71..a3efe62 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationData.java @@ -53,7 +53,7 @@ /** * Object including invitations and metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class InvitationData { public static final String SERIALIZED_NAME_INVITATIONS = "invitations"; @SerializedName(SERIALIZED_NAME_INVITATIONS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the InvitationData instance itself - */ - public InvitationData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } InvitationData invitationData = (InvitationData) o; return Objects.equals(this.invitations, invitationData.invitations) && - Objects.equals(this.paginationMetadata, invitationData.paginationMetadata)&& - Objects.equals(this.additionalProperties, invitationData.additionalProperties); + Objects.equals(this.paginationMetadata, invitationData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(invitations, paginationMetadata, additionalProperties); + return Objects.hash(invitations, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class InvitationData {\n"); sb.append(" invitations: ").append(toIndentedString(invitations)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in InvitationData is not found in the empty JSON string", InvitationData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!InvitationData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `InvitationData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("invitations") != null && !jsonObj.get("invitations").isJsonNull()) { JsonArray jsonArrayinvitations = jsonObj.getAsJsonArray("invitations"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, InvitationData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public InvitationData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - InvitationData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationFailedRecipients.java b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationFailedRecipients.java index 0ef38f3..c070e51 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationFailedRecipients.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationFailedRecipients.java @@ -51,7 +51,7 @@ /** * Encapsulates information regarding the failed invitation recipients */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class InvitationFailedRecipients { public static final String SERIALIZED_NAME_FAILED_RECIPIENTS = "failed_recipients"; @SerializedName(SERIALIZED_NAME_FAILED_RECIPIENTS) @@ -86,50 +86,6 @@ public void setFailedRecipients(List failedRecipients) { this.failedRecipients = failedRecipients; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the InvitationFailedRecipients instance itself - */ - public InvitationFailedRecipients putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -141,13 +97,12 @@ public boolean equals(Object o) { return false; } InvitationFailedRecipients invitationFailedRecipients = (InvitationFailedRecipients) o; - return Objects.equals(this.failedRecipients, invitationFailedRecipients.failedRecipients)&& - Objects.equals(this.additionalProperties, invitationFailedRecipients.additionalProperties); + return Objects.equals(this.failedRecipients, invitationFailedRecipients.failedRecipients); } @Override public int hashCode() { - return Objects.hash(failedRecipients, additionalProperties); + return Objects.hash(failedRecipients); } @Override @@ -155,7 +110,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class InvitationFailedRecipients {\n"); sb.append(" failedRecipients: ").append(toIndentedString(failedRecipients)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -198,6 +152,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!InvitationFailedRecipients.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `InvitationFailedRecipients` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : InvitationFailedRecipients.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -228,28 +190,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, InvitationFailedRecipients value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -257,28 +197,7 @@ else if (entry.getValue() instanceof Character) public InvitationFailedRecipients read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - InvitationFailedRecipients instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationGroupShareEmail.java b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationGroupShareEmail.java index 8bfc10c..aa8056e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationGroupShareEmail.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationGroupShareEmail.java @@ -53,7 +53,7 @@ /** * Encapsulates information regarding inviting people using email to share group, same permissions for all invitees */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class InvitationGroupShareEmail { public static final String SERIALIZED_NAME_ARRAY_ACTIONS = "array_actions"; @SerializedName(SERIALIZED_NAME_ARRAY_ACTIONS) @@ -150,50 +150,6 @@ public void setInviteeEmailOrName(List inviteeEmailOrName) { this.inviteeEmailOrName = inviteeEmailOrName; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the InvitationGroupShareEmail instance itself - */ - public InvitationGroupShareEmail putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -207,13 +163,12 @@ public boolean equals(Object o) { InvitationGroupShareEmail invitationGroupShareEmail = (InvitationGroupShareEmail) o; return Objects.equals(this.arrayActions, invitationGroupShareEmail.arrayActions) && Objects.equals(this.groupActions, invitationGroupShareEmail.groupActions) && - Objects.equals(this.inviteeEmailOrName, invitationGroupShareEmail.inviteeEmailOrName)&& - Objects.equals(this.additionalProperties, invitationGroupShareEmail.additionalProperties); + Objects.equals(this.inviteeEmailOrName, invitationGroupShareEmail.inviteeEmailOrName); } @Override public int hashCode() { - return Objects.hash(arrayActions, groupActions, inviteeEmailOrName, additionalProperties); + return Objects.hash(arrayActions, groupActions, inviteeEmailOrName); } @Override @@ -223,7 +178,6 @@ public String toString() { sb.append(" arrayActions: ").append(toIndentedString(arrayActions)).append("\n"); sb.append(" groupActions: ").append(toIndentedString(groupActions)).append("\n"); sb.append(" inviteeEmailOrName: ").append(toIndentedString(inviteeEmailOrName)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -269,32 +223,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in InvitationGroupShareEmail is not found in the empty JSON string", InvitationGroupShareEmail.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : InvitationGroupShareEmail.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the required json array is present - if (jsonObj.get("array_actions") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("array_actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `array_actions` to be an array in the JSON string but got `%s`", jsonObj.get("array_actions").toString())); - } - // ensure the required json array is present - if (jsonObj.get("group_actions") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("group_actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `group_actions` to be an array in the JSON string but got `%s`", jsonObj.get("group_actions").toString())); - } - // ensure the required json array is present - if (jsonObj.get("invitee_email_or_name") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("invitee_email_or_name").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `invitee_email_or_name` to be an array in the JSON string but got `%s`", jsonObj.get("invitee_email_or_name").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -312,28 +240,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, InvitationGroupShareEmail value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -341,28 +247,7 @@ else if (entry.getValue() instanceof Character) public InvitationGroupShareEmail read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - InvitationGroupShareEmail instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationOrganizationJoinEmail.java b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationOrganizationJoinEmail.java index 3c33477..71771b8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/InvitationOrganizationJoinEmail.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/InvitationOrganizationJoinEmail.java @@ -53,7 +53,7 @@ /** * Encapsulates information regarding inviting people using email to join organization, same permissions for all invitees */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class InvitationOrganizationJoinEmail { public static final String SERIALIZED_NAME_ACTIONS = "actions"; @SerializedName(SERIALIZED_NAME_ACTIONS) @@ -142,50 +142,6 @@ public void setInviteeEmail(List inviteeEmail) { this.inviteeEmail = inviteeEmail; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the InvitationOrganizationJoinEmail instance itself - */ - public InvitationOrganizationJoinEmail putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -199,13 +155,12 @@ public boolean equals(Object o) { InvitationOrganizationJoinEmail invitationOrganizationJoinEmail = (InvitationOrganizationJoinEmail) o; return Objects.equals(this.actions, invitationOrganizationJoinEmail.actions) && Objects.equals(this.organizationRole, invitationOrganizationJoinEmail.organizationRole) && - Objects.equals(this.inviteeEmail, invitationOrganizationJoinEmail.inviteeEmail)&& - Objects.equals(this.additionalProperties, invitationOrganizationJoinEmail.additionalProperties); + Objects.equals(this.inviteeEmail, invitationOrganizationJoinEmail.inviteeEmail); } @Override public int hashCode() { - return Objects.hash(actions, organizationRole, inviteeEmail, additionalProperties); + return Objects.hash(actions, organizationRole, inviteeEmail); } @Override @@ -215,7 +170,6 @@ public String toString() { sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" organizationRole: ").append(toIndentedString(organizationRole)).append("\n"); sb.append(" inviteeEmail: ").append(toIndentedString(inviteeEmail)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -260,26 +214,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in InvitationOrganizationJoinEmail is not found in the empty JSON string", InvitationOrganizationJoinEmail.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : InvitationOrganizationJoinEmail.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the optional json data is an array if present - if (jsonObj.get("actions") != null && !jsonObj.get("actions").isJsonNull() && !jsonObj.get("actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `actions` to be an array in the JSON string but got `%s`", jsonObj.get("actions").toString())); - } - // validate the required field `organization_role` - OrganizationRoles.validateJsonElement(jsonObj.get("organization_role")); - // ensure the required json array is present - if (jsonObj.get("invitee_email") == null) { - throw new IllegalArgumentException("Expected the field `linkedContent` to be an array in the JSON string but got `null`"); - } else if (!jsonObj.get("invitee_email").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `invitee_email` to be an array in the JSON string but got `%s`", jsonObj.get("invitee_email").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -297,28 +231,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, InvitationOrganizationJoinEmail value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -326,28 +238,7 @@ else if (entry.getValue() instanceof Character) public InvitationOrganizationJoinEmail read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - InvitationOrganizationJoinEmail instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/LastAccessedArray.java b/src/main/java/io/tiledb/cloud/rest_api/model/LastAccessedArray.java index 9acb257..cfbd879 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/LastAccessedArray.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/LastAccessedArray.java @@ -51,7 +51,7 @@ /** * Information related to last access of an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class LastAccessedArray { public static final String SERIALIZED_NAME_ARRAY_ID = "array_id"; @SerializedName(SERIALIZED_NAME_ARRAY_ID) @@ -170,50 +170,6 @@ public void setAccessType(ActivityEventType accessType) { this.accessType = accessType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the LastAccessedArray instance itself - */ - public LastAccessedArray putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -229,13 +185,12 @@ public boolean equals(Object o) { Objects.equals(this.arrayName, lastAccessedArray.arrayName) && Objects.equals(this.namespace, lastAccessedArray.namespace) && Objects.equals(this.accessedTime, lastAccessedArray.accessedTime) && - Objects.equals(this.accessType, lastAccessedArray.accessType)&& - Objects.equals(this.additionalProperties, lastAccessedArray.additionalProperties); + Objects.equals(this.accessType, lastAccessedArray.accessType); } @Override public int hashCode() { - return Objects.hash(arrayId, arrayName, namespace, accessedTime, accessType, additionalProperties); + return Objects.hash(arrayId, arrayName, namespace, accessedTime, accessType); } @Override @@ -247,7 +202,6 @@ public String toString() { sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" accessedTime: ").append(toIndentedString(accessedTime)).append("\n"); sb.append(" accessType: ").append(toIndentedString(accessType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -292,6 +246,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in LastAccessedArray is not found in the empty JSON string", LastAccessedArray.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!LastAccessedArray.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `LastAccessedArray` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("array_id") != null && !jsonObj.get("array_id").isJsonNull()) && !jsonObj.get("array_id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `array_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("array_id").toString())); @@ -323,28 +285,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, LastAccessedArray value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -352,28 +292,7 @@ else if (entry.getValue() instanceof Character) public LastAccessedArray read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - LastAccessedArray instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaRequest.java index 061e96f..34f1ef5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaRequest.java @@ -50,7 +50,7 @@ /** * Request to load an array schema */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class LoadArraySchemaRequest { public static final String SERIALIZED_NAME_CONFIG = "config"; @SerializedName(SERIALIZED_NAME_CONFIG) @@ -77,50 +77,6 @@ public void setConfig(TileDBConfig config) { this.config = config; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the LoadArraySchemaRequest instance itself - */ - public LoadArraySchemaRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -132,13 +88,12 @@ public boolean equals(Object o) { return false; } LoadArraySchemaRequest loadArraySchemaRequest = (LoadArraySchemaRequest) o; - return Objects.equals(this.config, loadArraySchemaRequest.config)&& - Objects.equals(this.additionalProperties, loadArraySchemaRequest.additionalProperties); + return Objects.equals(this.config, loadArraySchemaRequest.config); } @Override public int hashCode() { - return Objects.hash(config, additionalProperties); + return Objects.hash(config); } @Override @@ -146,7 +101,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class LoadArraySchemaRequest {\n"); sb.append(" config: ").append(toIndentedString(config)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -187,11 +141,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in LoadArraySchemaRequest is not found in the empty JSON string", LoadArraySchemaRequest.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `config` - if (jsonObj.get("config") != null && !jsonObj.get("config").isJsonNull()) { - TileDBConfig.validateJsonElement(jsonObj.get("config")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -209,28 +158,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, LoadArraySchemaRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -238,28 +165,7 @@ else if (entry.getValue() instanceof Character) public LoadArraySchemaRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - LoadArraySchemaRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaResponse.java b/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaResponse.java index bb3786f..51c32aa 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaResponse.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/LoadArraySchemaResponse.java @@ -52,7 +52,7 @@ /** * Contains the latest schema and all schemas for the opened array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class LoadArraySchemaResponse { public static final String SERIALIZED_NAME_LATEST_ARRAY_SCHEMA = "latest_array_schema"; @SerializedName(SERIALIZED_NAME_LATEST_ARRAY_SCHEMA) @@ -110,50 +110,6 @@ public void setAllArraySchemas(Map allArraySchemas) { this.allArraySchemas = allArraySchemas; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the LoadArraySchemaResponse instance itself - */ - public LoadArraySchemaResponse putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -166,13 +122,12 @@ public boolean equals(Object o) { } LoadArraySchemaResponse loadArraySchemaResponse = (LoadArraySchemaResponse) o; return Objects.equals(this.latestArraySchema, loadArraySchemaResponse.latestArraySchema) && - Objects.equals(this.allArraySchemas, loadArraySchemaResponse.allArraySchemas)&& - Objects.equals(this.additionalProperties, loadArraySchemaResponse.additionalProperties); + Objects.equals(this.allArraySchemas, loadArraySchemaResponse.allArraySchemas); } @Override public int hashCode() { - return Objects.hash(latestArraySchema, allArraySchemas, additionalProperties); + return Objects.hash(latestArraySchema, allArraySchemas); } @Override @@ -181,7 +136,6 @@ public String toString() { sb.append("class LoadArraySchemaResponse {\n"); sb.append(" latestArraySchema: ").append(toIndentedString(latestArraySchema)).append("\n"); sb.append(" allArraySchemas: ").append(toIndentedString(allArraySchemas)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -223,11 +177,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in LoadArraySchemaResponse is not found in the empty JSON string", LoadArraySchemaResponse.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `latest_array_schema` - if (jsonObj.get("latest_array_schema") != null && !jsonObj.get("latest_array_schema").isJsonNull()) { - ArraySchema.validateJsonElement(jsonObj.get("latest_array_schema")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -245,28 +194,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, LoadArraySchemaResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -274,28 +201,7 @@ else if (entry.getValue() instanceof Character) public LoadArraySchemaResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - LoadArraySchemaResponse instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsRequest.java index 8ce920c..b9f9ad8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsRequest.java @@ -52,7 +52,7 @@ /** * Request to return enumerations for attributes */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class LoadEnumerationsRequest { public static final String SERIALIZED_NAME_CONFIG = "config"; @SerializedName(SERIALIZED_NAME_CONFIG) @@ -110,50 +110,6 @@ public void setEnumerations(List enumerations) { this.enumerations = enumerations; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the LoadEnumerationsRequest instance itself - */ - public LoadEnumerationsRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -166,13 +122,12 @@ public boolean equals(Object o) { } LoadEnumerationsRequest loadEnumerationsRequest = (LoadEnumerationsRequest) o; return Objects.equals(this.config, loadEnumerationsRequest.config) && - Objects.equals(this.enumerations, loadEnumerationsRequest.enumerations)&& - Objects.equals(this.additionalProperties, loadEnumerationsRequest.additionalProperties); + Objects.equals(this.enumerations, loadEnumerationsRequest.enumerations); } @Override public int hashCode() { - return Objects.hash(config, enumerations, additionalProperties); + return Objects.hash(config, enumerations); } @Override @@ -181,7 +136,6 @@ public String toString() { sb.append("class LoadEnumerationsRequest {\n"); sb.append(" config: ").append(toIndentedString(config)).append("\n"); sb.append(" enumerations: ").append(toIndentedString(enumerations)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -223,15 +177,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in LoadEnumerationsRequest is not found in the empty JSON string", LoadEnumerationsRequest.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `config` - if (jsonObj.get("config") != null && !jsonObj.get("config").isJsonNull()) { - TileDBConfig.validateJsonElement(jsonObj.get("config")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("enumerations") != null && !jsonObj.get("enumerations").isJsonNull() && !jsonObj.get("enumerations").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `enumerations` to be an array in the JSON string but got `%s`", jsonObj.get("enumerations").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -249,28 +194,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, LoadEnumerationsRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -278,28 +201,7 @@ else if (entry.getValue() instanceof Character) public LoadEnumerationsRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - LoadEnumerationsRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsResponse.java b/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsResponse.java index 6ec4519..ef40543 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsResponse.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/LoadEnumerationsResponse.java @@ -52,7 +52,7 @@ /** * Contains the enumerations of the array's attributes */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class LoadEnumerationsResponse { public static final String SERIALIZED_NAME_ENUMERATIONS = "enumerations"; @SerializedName(SERIALIZED_NAME_ENUMERATIONS) @@ -87,50 +87,6 @@ public void setEnumerations(List enumerations) { this.enumerations = enumerations; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the LoadEnumerationsResponse instance itself - */ - public LoadEnumerationsResponse putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } LoadEnumerationsResponse loadEnumerationsResponse = (LoadEnumerationsResponse) o; - return Objects.equals(this.enumerations, loadEnumerationsResponse.enumerations)&& - Objects.equals(this.additionalProperties, loadEnumerationsResponse.additionalProperties); + return Objects.equals(this.enumerations, loadEnumerationsResponse.enumerations); } @Override public int hashCode() { - return Objects.hash(enumerations, additionalProperties); + return Objects.hash(enumerations); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class LoadEnumerationsResponse {\n"); sb.append(" enumerations: ").append(toIndentedString(enumerations)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in LoadEnumerationsResponse is not found in the empty JSON string", LoadEnumerationsResponse.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("enumerations") != null && !jsonObj.get("enumerations").isJsonNull()) { - JsonArray jsonArrayenumerations = jsonObj.getAsJsonArray("enumerations"); - if (jsonArrayenumerations != null) { - // ensure the json data is an array - if (!jsonObj.get("enumerations").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `enumerations` to be an array in the JSON string but got `%s`", jsonObj.get("enumerations").toString())); - } - - // validate the optional field `enumerations` (array) - for (int i = 0; i < jsonArrayenumerations.size(); i++) { - Enumeration.validateJsonElement(jsonArrayenumerations.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, LoadEnumerationsResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public LoadEnumerationsResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - LoadEnumerationsResponse instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavorite.java b/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavorite.java index e74fc72..0723228 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavorite.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavorite.java @@ -49,7 +49,7 @@ /** * A user-favorite MLModel item */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class MLModelFavorite { public static final String SERIALIZED_NAME_MLMODEL_UUID = "mlmodel_uuid"; @SerializedName(SERIALIZED_NAME_MLMODEL_UUID) @@ -122,50 +122,6 @@ public void setName(String name) { this.name = name; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the MLModelFavorite instance itself - */ - public MLModelFavorite putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { MLModelFavorite mlModelFavorite = (MLModelFavorite) o; return Objects.equals(this.mlmodelUuid, mlModelFavorite.mlmodelUuid) && Objects.equals(this.namespace, mlModelFavorite.namespace) && - Objects.equals(this.name, mlModelFavorite.name)&& - Objects.equals(this.additionalProperties, mlModelFavorite.additionalProperties); + Objects.equals(this.name, mlModelFavorite.name); } @Override public int hashCode() { - return Objects.hash(mlmodelUuid, namespace, name, additionalProperties); + return Objects.hash(mlmodelUuid, namespace, name); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" mlmodelUuid: ").append(toIndentedString(mlmodelUuid)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,16 +192,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in MLModelFavorite is not found in the empty JSON string", MLModelFavorite.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("mlmodel_uuid") != null && !jsonObj.get("mlmodel_uuid").isJsonNull()) && !jsonObj.get("mlmodel_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `mlmodel_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("mlmodel_uuid").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -265,28 +209,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, MLModelFavorite value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +216,7 @@ else if (entry.getValue() instanceof Character) public MLModelFavorite read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - MLModelFavorite instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavoritesData.java b/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavoritesData.java index bb15bda..ba52b4f 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavoritesData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/MLModelFavoritesData.java @@ -53,7 +53,7 @@ /** * Object including MLModel favorites and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class MLModelFavoritesData { public static final String SERIALIZED_NAME_MLMODELS = "mlmodels"; @SerializedName(SERIALIZED_NAME_MLMODELS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the MLModelFavoritesData instance itself - */ - public MLModelFavoritesData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } MLModelFavoritesData mlModelFavoritesData = (MLModelFavoritesData) o; return Objects.equals(this.mlmodels, mlModelFavoritesData.mlmodels) && - Objects.equals(this.paginationMetadata, mlModelFavoritesData.paginationMetadata)&& - Objects.equals(this.additionalProperties, mlModelFavoritesData.additionalProperties); + Objects.equals(this.paginationMetadata, mlModelFavoritesData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(mlmodels, paginationMetadata, additionalProperties); + return Objects.hash(mlmodels, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class MLModelFavoritesData {\n"); sb.append(" mlmodels: ").append(toIndentedString(mlmodels)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in MLModelFavoritesData is not found in the empty JSON string", MLModelFavoritesData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!MLModelFavoritesData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `MLModelFavoritesData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("mlmodels") != null && !jsonObj.get("mlmodels").isJsonNull()) { JsonArray jsonArraymlmodels = jsonObj.getAsJsonArray("mlmodels"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, MLModelFavoritesData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public MLModelFavoritesData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - MLModelFavoritesData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/MaxBufferSizes.java b/src/main/java/io/tiledb/cloud/rest_api/model/MaxBufferSizes.java index 440be04..a22aa55 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/MaxBufferSizes.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/MaxBufferSizes.java @@ -52,7 +52,7 @@ /** * a list of max buffer sizes, one per attribute */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class MaxBufferSizes { public static final String SERIALIZED_NAME_MAX_BUFFER_SIZES = "maxBufferSizes"; @SerializedName(SERIALIZED_NAME_MAX_BUFFER_SIZES) @@ -87,50 +87,6 @@ public void setMaxBufferSizes(List maxBufferSizes) { this.maxBufferSizes = maxBufferSizes; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the MaxBufferSizes instance itself - */ - public MaxBufferSizes putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } MaxBufferSizes maxBufferSizes = (MaxBufferSizes) o; - return Objects.equals(this.maxBufferSizes, maxBufferSizes.maxBufferSizes)&& - Objects.equals(this.additionalProperties, maxBufferSizes.additionalProperties); + return Objects.equals(this.maxBufferSizes, maxBufferSizes.maxBufferSizes); } @Override public int hashCode() { - return Objects.hash(maxBufferSizes, additionalProperties); + return Objects.hash(maxBufferSizes); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MaxBufferSizes {\n"); sb.append(" maxBufferSizes: ").append(toIndentedString(maxBufferSizes)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,6 +151,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in MaxBufferSizes is not found in the empty JSON string", MaxBufferSizes.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!MaxBufferSizes.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `MaxBufferSizes` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("maxBufferSizes") != null && !jsonObj.get("maxBufferSizes").isJsonNull()) { JsonArray jsonArraymaxBufferSizes = jsonObj.getAsJsonArray("maxBufferSizes"); @@ -229,28 +191,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, MaxBufferSizes value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +198,7 @@ else if (entry.getValue() instanceof Character) public MaxBufferSizes read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - MaxBufferSizes instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringified.java b/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringified.java index beda1db..a451ab4 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringified.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringified.java @@ -52,7 +52,7 @@ /** * The user's TileDB metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class MetadataStringified { public static final String SERIALIZED_NAME_ENTRIES = "entries"; @SerializedName(SERIALIZED_NAME_ENTRIES) @@ -87,50 +87,6 @@ public void setEntries(List entries) { this.entries = entries; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the MetadataStringified instance itself - */ - public MetadataStringified putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } MetadataStringified metadataStringified = (MetadataStringified) o; - return Objects.equals(this.entries, metadataStringified.entries)&& - Objects.equals(this.additionalProperties, metadataStringified.additionalProperties); + return Objects.equals(this.entries, metadataStringified.entries); } @Override public int hashCode() { - return Objects.hash(entries, additionalProperties); + return Objects.hash(entries); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class MetadataStringified {\n"); sb.append(" entries: ").append(toIndentedString(entries)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in MetadataStringified is not found in the empty JSON string", MetadataStringified.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("entries") != null && !jsonObj.get("entries").isJsonNull()) { - JsonArray jsonArrayentries = jsonObj.getAsJsonArray("entries"); - if (jsonArrayentries != null) { - // ensure the json data is an array - if (!jsonObj.get("entries").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `entries` to be an array in the JSON string but got `%s`", jsonObj.get("entries").toString())); - } - - // validate the optional field `entries` (array) - for (int i = 0; i < jsonArrayentries.size(); i++) { - MetadataStringifiedEntry.validateJsonElement(jsonArrayentries.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, MetadataStringified value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public MetadataStringified read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - MetadataStringified instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringifiedEntry.java b/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringifiedEntry.java index c7e1a98..58fbc2a 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringifiedEntry.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/MetadataStringifiedEntry.java @@ -49,7 +49,7 @@ /** * key/value pair representing an asset metadata map entry */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class MetadataStringifiedEntry { public static final String SERIALIZED_NAME_KEY = "key"; @SerializedName(SERIALIZED_NAME_KEY) @@ -122,50 +122,6 @@ public void setType(String type) { this.type = type; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the MetadataStringifiedEntry instance itself - */ - public MetadataStringifiedEntry putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { MetadataStringifiedEntry metadataStringifiedEntry = (MetadataStringifiedEntry) o; return Objects.equals(this.key, metadataStringifiedEntry.key) && Objects.equals(this.value, metadataStringifiedEntry.value) && - Objects.equals(this.type, metadataStringifiedEntry.type)&& - Objects.equals(this.additionalProperties, metadataStringifiedEntry.additionalProperties); + Objects.equals(this.type, metadataStringifiedEntry.type); } @Override public int hashCode() { - return Objects.hash(key, value, type, additionalProperties); + return Objects.hash(key, value, type); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" key: ").append(toIndentedString(key)).append("\n"); sb.append(" value: ").append(toIndentedString(value)).append("\n"); sb.append(" type: ").append(toIndentedString(type)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in MetadataStringifiedEntry is not found in the empty JSON string", MetadataStringifiedEntry.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!MetadataStringifiedEntry.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `MetadataStringifiedEntry` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("key") != null && !jsonObj.get("key").isJsonNull()) && !jsonObj.get("key").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `key` to be a primitive type in the JSON string but got `%s`", jsonObj.get("key").toString())); @@ -265,28 +227,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, MetadataStringifiedEntry value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +234,7 @@ else if (entry.getValue() instanceof Character) public MetadataStringifiedEntry read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - MetadataStringifiedEntry instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/MultiArrayUDF.java b/src/main/java/io/tiledb/cloud/rest_api/model/MultiArrayUDF.java index 81e3ce7..41a0f43 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/MultiArrayUDF.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/MultiArrayUDF.java @@ -58,7 +58,7 @@ /** * User-defined function */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class MultiArrayUDF { public static final String SERIALIZED_NAME_UDF_INFO_NAME = "udf_info_name"; @SerializedName(SERIALIZED_NAME_UDF_INFO_NAME) @@ -600,50 +600,6 @@ public void setClientNodeUuid(String clientNodeUuid) { this.clientNodeUuid = clientNodeUuid; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the MultiArrayUDF instance itself - */ - public MultiArrayUDF putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -676,8 +632,7 @@ public boolean equals(Object o) { Objects.equals(this.arrays, multiArrayUDF.arrays) && Objects.equals(this.timeout, multiArrayUDF.timeout) && Objects.equals(this.taskGraphUuid, multiArrayUDF.taskGraphUuid) && - Objects.equals(this.clientNodeUuid, multiArrayUDF.clientNodeUuid)&& - Objects.equals(this.additionalProperties, multiArrayUDF.additionalProperties); + Objects.equals(this.clientNodeUuid, multiArrayUDF.clientNodeUuid); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -686,7 +641,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(udfInfoName, language, version, imageName, accessCredentialsName, resourceClass, exec, execRaw, resultFormat, taskName, argument, argumentsJson, storedParamUuids, storeResults, dontDownloadResults, ranges, subarray, buffers, arrays, timeout, taskGraphUuid, clientNodeUuid, additionalProperties); + return Objects.hash(udfInfoName, language, version, imageName, accessCredentialsName, resourceClass, exec, execRaw, resultFormat, taskName, argument, argumentsJson, storedParamUuids, storeResults, dontDownloadResults, ranges, subarray, buffers, arrays, timeout, taskGraphUuid, clientNodeUuid); } private static int hashCodeNullable(JsonNullable a) { @@ -722,7 +677,6 @@ public String toString() { sb.append(" timeout: ").append(toIndentedString(timeout)).append("\n"); sb.append(" taskGraphUuid: ").append(toIndentedString(taskGraphUuid)).append("\n"); sb.append(" clientNodeUuid: ").append(toIndentedString(clientNodeUuid)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -784,92 +738,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in MultiArrayUDF is not found in the empty JSON string", MultiArrayUDF.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("udf_info_name") != null && !jsonObj.get("udf_info_name").isJsonNull()) && !jsonObj.get("udf_info_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `udf_info_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("udf_info_name").toString())); - } - // validate the optional field `language` - if (jsonObj.get("language") != null && !jsonObj.get("language").isJsonNull()) { - UDFLanguage.validateJsonElement(jsonObj.get("language")); - } - if ((jsonObj.get("version") != null && !jsonObj.get("version").isJsonNull()) && !jsonObj.get("version").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `version` to be a primitive type in the JSON string but got `%s`", jsonObj.get("version").toString())); - } - if ((jsonObj.get("image_name") != null && !jsonObj.get("image_name").isJsonNull()) && !jsonObj.get("image_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `image_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("image_name").toString())); - } - if ((jsonObj.get("access_credentials_name") != null && !jsonObj.get("access_credentials_name").isJsonNull()) && !jsonObj.get("access_credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `access_credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("access_credentials_name").toString())); - } - if ((jsonObj.get("resource_class") != null && !jsonObj.get("resource_class").isJsonNull()) && !jsonObj.get("resource_class").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `resource_class` to be a primitive type in the JSON string but got `%s`", jsonObj.get("resource_class").toString())); - } - if ((jsonObj.get("exec") != null && !jsonObj.get("exec").isJsonNull()) && !jsonObj.get("exec").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `exec` to be a primitive type in the JSON string but got `%s`", jsonObj.get("exec").toString())); - } - if ((jsonObj.get("exec_raw") != null && !jsonObj.get("exec_raw").isJsonNull()) && !jsonObj.get("exec_raw").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `exec_raw` to be a primitive type in the JSON string but got `%s`", jsonObj.get("exec_raw").toString())); - } - // validate the optional field `result_format` - if (jsonObj.get("result_format") != null && !jsonObj.get("result_format").isJsonNull()) { - ResultFormat.validateJsonElement(jsonObj.get("result_format")); - } - if ((jsonObj.get("task_name") != null && !jsonObj.get("task_name").isJsonNull()) && !jsonObj.get("task_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `task_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("task_name").toString())); - } - if ((jsonObj.get("argument") != null && !jsonObj.get("argument").isJsonNull()) && !jsonObj.get("argument").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `argument` to be a primitive type in the JSON string but got `%s`", jsonObj.get("argument").toString())); - } - if (jsonObj.get("arguments_json") != null && !jsonObj.get("arguments_json").isJsonNull()) { - JsonArray jsonArrayargumentsJson = jsonObj.getAsJsonArray("arguments_json"); - if (jsonArrayargumentsJson != null) { - // ensure the json data is an array - if (!jsonObj.get("arguments_json").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `arguments_json` to be an array in the JSON string but got `%s`", jsonObj.get("arguments_json").toString())); - } - - // validate the optional field `arguments_json` (array) - for (int i = 0; i < jsonArrayargumentsJson.size(); i++) { - TGUDFArgument.validateJsonElement(jsonArrayargumentsJson.get(i)); - }; - } - } - // ensure the optional json data is an array if present - if (jsonObj.get("stored_param_uuids") != null && !jsonObj.get("stored_param_uuids").isJsonNull() && !jsonObj.get("stored_param_uuids").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `stored_param_uuids` to be an array in the JSON string but got `%s`", jsonObj.get("stored_param_uuids").toString())); - } - // validate the optional field `ranges` - if (jsonObj.get("ranges") != null && !jsonObj.get("ranges").isJsonNull()) { - QueryRanges.validateJsonElement(jsonObj.get("ranges")); - } - // validate the optional field `subarray` - if (jsonObj.get("subarray") != null && !jsonObj.get("subarray").isJsonNull()) { - UDFSubarray.validateJsonElement(jsonObj.get("subarray")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("buffers") != null && !jsonObj.get("buffers").isJsonNull() && !jsonObj.get("buffers").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `buffers` to be an array in the JSON string but got `%s`", jsonObj.get("buffers").toString())); - } - if (jsonObj.get("arrays") != null && !jsonObj.get("arrays").isJsonNull()) { - JsonArray jsonArrayarrays = jsonObj.getAsJsonArray("arrays"); - if (jsonArrayarrays != null) { - // ensure the json data is an array - if (!jsonObj.get("arrays").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `arrays` to be an array in the JSON string but got `%s`", jsonObj.get("arrays").toString())); - } - - // validate the optional field `arrays` (array) - for (int i = 0; i < jsonArrayarrays.size(); i++) { - UDFArrayDetails.validateJsonElement(jsonArrayarrays.get(i)); - }; - } - } - if ((jsonObj.get("task_graph_uuid") != null && !jsonObj.get("task_graph_uuid").isJsonNull()) && !jsonObj.get("task_graph_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `task_graph_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("task_graph_uuid").toString())); - } - if ((jsonObj.get("client_node_uuid") != null && !jsonObj.get("client_node_uuid").isJsonNull()) && !jsonObj.get("client_node_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `client_node_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("client_node_uuid").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -887,28 +755,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, MultiArrayUDF value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -916,28 +762,7 @@ else if (entry.getValue() instanceof Character) public MultiArrayUDF read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - MultiArrayUDF instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/NonEmptyDomain.java b/src/main/java/io/tiledb/cloud/rest_api/model/NonEmptyDomain.java index d99b487..1d04add 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/NonEmptyDomain.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/NonEmptyDomain.java @@ -50,7 +50,7 @@ /** * object representing a non-empty domain */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class NonEmptyDomain { public static final String SERIALIZED_NAME_NON_EMPTY_DOMAIN = "nonEmptyDomain"; @SerializedName(SERIALIZED_NAME_NON_EMPTY_DOMAIN) @@ -100,50 +100,6 @@ public void setIsEmpty(Boolean isEmpty) { this.isEmpty = isEmpty; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the NonEmptyDomain instance itself - */ - public NonEmptyDomain putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -156,13 +112,12 @@ public boolean equals(Object o) { } NonEmptyDomain nonEmptyDomain = (NonEmptyDomain) o; return Objects.equals(this.nonEmptyDomain, nonEmptyDomain.nonEmptyDomain) && - Objects.equals(this.isEmpty, nonEmptyDomain.isEmpty)&& - Objects.equals(this.additionalProperties, nonEmptyDomain.additionalProperties); + Objects.equals(this.isEmpty, nonEmptyDomain.isEmpty); } @Override public int hashCode() { - return Objects.hash(nonEmptyDomain, isEmpty, additionalProperties); + return Objects.hash(nonEmptyDomain, isEmpty); } @Override @@ -171,7 +126,6 @@ public String toString() { sb.append("class NonEmptyDomain {\n"); sb.append(" nonEmptyDomain: ").append(toIndentedString(nonEmptyDomain)).append("\n"); sb.append(" isEmpty: ").append(toIndentedString(isEmpty)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -216,6 +170,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!NonEmptyDomain.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `NonEmptyDomain` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : NonEmptyDomain.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -242,28 +204,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, NonEmptyDomain value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -271,28 +211,7 @@ else if (entry.getValue() instanceof Character) public NonEmptyDomain read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - NonEmptyDomain instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopied.java b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopied.java index 89e1edc..036b6d5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopied.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopied.java @@ -49,7 +49,7 @@ /** * Copied notebook uri and information */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class NotebookCopied { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -145,50 +145,6 @@ public void setId(String id) { this.id = id; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the NotebookCopied instance itself - */ - public NotebookCopied putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -203,13 +159,12 @@ public boolean equals(Object o) { return Objects.equals(this.outputUri, notebookCopied.outputUri) && Objects.equals(this.name, notebookCopied.name) && Objects.equals(this.namespace, notebookCopied.namespace) && - Objects.equals(this.id, notebookCopied.id)&& - Objects.equals(this.additionalProperties, notebookCopied.additionalProperties); + Objects.equals(this.id, notebookCopied.id); } @Override public int hashCode() { - return Objects.hash(outputUri, name, namespace, id, additionalProperties); + return Objects.hash(outputUri, name, namespace, id); } @Override @@ -220,7 +175,6 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,26 +219,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in NotebookCopied is not found in the empty JSON string", NotebookCopied.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : NotebookCopied.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("output_uri") != null && !jsonObj.get("output_uri").isJsonNull()) && !jsonObj.get("output_uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `output_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("output_uri").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if (!jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -302,28 +236,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, NotebookCopied value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -331,28 +243,7 @@ else if (entry.getValue() instanceof Character) public NotebookCopied read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - NotebookCopied instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopy.java b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopy.java index 7eb2f72..b62354d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopy.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookCopy.java @@ -49,7 +49,7 @@ /** * Output information required to copy a notebook */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class NotebookCopy { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -122,50 +122,6 @@ public void setNamespace(String namespace) { this.namespace = namespace; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the NotebookCopy instance itself - */ - public NotebookCopy putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { NotebookCopy notebookCopy = (NotebookCopy) o; return Objects.equals(this.outputUri, notebookCopy.outputUri) && Objects.equals(this.name, notebookCopy.name) && - Objects.equals(this.namespace, notebookCopy.namespace)&& - Objects.equals(this.additionalProperties, notebookCopy.additionalProperties); + Objects.equals(this.namespace, notebookCopy.namespace); } @Override public int hashCode() { - return Objects.hash(outputUri, name, namespace, additionalProperties); + return Objects.hash(outputUri, name, namespace); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in NotebookCopy is not found in the empty JSON string", NotebookCopy.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!NotebookCopy.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `NotebookCopy` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("output_uri") != null && !jsonObj.get("output_uri").isJsonNull()) && !jsonObj.get("output_uri").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `output_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("output_uri").toString())); @@ -265,28 +227,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, NotebookCopy value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +234,7 @@ else if (entry.getValue() instanceof Character) public NotebookCopy read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - NotebookCopy instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavorite.java b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavorite.java index 6f08563..3092546 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavorite.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavorite.java @@ -49,7 +49,7 @@ /** * A user-favorite notebook item */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class NotebookFavorite { public static final String SERIALIZED_NAME_NOTEBOOK_UUID = "notebook_uuid"; @SerializedName(SERIALIZED_NAME_NOTEBOOK_UUID) @@ -122,50 +122,6 @@ public void setName(String name) { this.name = name; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the NotebookFavorite instance itself - */ - public NotebookFavorite putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { NotebookFavorite notebookFavorite = (NotebookFavorite) o; return Objects.equals(this.notebookUuid, notebookFavorite.notebookUuid) && Objects.equals(this.namespace, notebookFavorite.namespace) && - Objects.equals(this.name, notebookFavorite.name)&& - Objects.equals(this.additionalProperties, notebookFavorite.additionalProperties); + Objects.equals(this.name, notebookFavorite.name); } @Override public int hashCode() { - return Objects.hash(notebookUuid, namespace, name, additionalProperties); + return Objects.hash(notebookUuid, namespace, name); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" notebookUuid: ").append(toIndentedString(notebookUuid)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,16 +192,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in NotebookFavorite is not found in the empty JSON string", NotebookFavorite.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("notebook_uuid") != null && !jsonObj.get("notebook_uuid").isJsonNull()) && !jsonObj.get("notebook_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `notebook_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("notebook_uuid").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -265,28 +209,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, NotebookFavorite value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +216,7 @@ else if (entry.getValue() instanceof Character) public NotebookFavorite read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - NotebookFavorite instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavoritesData.java b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavoritesData.java index fe6fba2..5ab416d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavoritesData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookFavoritesData.java @@ -53,7 +53,7 @@ /** * Object including notebook favorites and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class NotebookFavoritesData { public static final String SERIALIZED_NAME_NOTEBOOKS = "notebooks"; @SerializedName(SERIALIZED_NAME_NOTEBOOKS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the NotebookFavoritesData instance itself - */ - public NotebookFavoritesData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } NotebookFavoritesData notebookFavoritesData = (NotebookFavoritesData) o; return Objects.equals(this.notebooks, notebookFavoritesData.notebooks) && - Objects.equals(this.paginationMetadata, notebookFavoritesData.paginationMetadata)&& - Objects.equals(this.additionalProperties, notebookFavoritesData.additionalProperties); + Objects.equals(this.paginationMetadata, notebookFavoritesData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(notebooks, paginationMetadata, additionalProperties); + return Objects.hash(notebooks, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class NotebookFavoritesData {\n"); sb.append(" notebooks: ").append(toIndentedString(notebooks)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,25 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in NotebookFavoritesData is not found in the empty JSON string", NotebookFavoritesData.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("notebooks") != null && !jsonObj.get("notebooks").isJsonNull()) { - JsonArray jsonArraynotebooks = jsonObj.getAsJsonArray("notebooks"); - if (jsonArraynotebooks != null) { - // ensure the json data is an array - if (!jsonObj.get("notebooks").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `notebooks` to be an array in the JSON string but got `%s`", jsonObj.get("notebooks").toString())); - } - - // validate the optional field `notebooks` (array) - for (int i = 0; i < jsonArraynotebooks.size(); i++) { - ArrayInfo.validateJsonElement(jsonArraynotebooks.get(i)); - }; - } - } - // validate the optional field `pagination_metadata` - if (jsonObj.get("pagination_metadata") != null && !jsonObj.get("pagination_metadata").isJsonNull()) { - PaginationMetadata.validateJsonElement(jsonObj.get("pagination_metadata")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -260,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, NotebookFavoritesData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +202,7 @@ else if (entry.getValue() instanceof Character) public NotebookFavoritesData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - NotebookFavoritesData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookStatus.java b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookStatus.java index 9b2c461..9e12299 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/NotebookStatus.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/NotebookStatus.java @@ -51,7 +51,7 @@ /** * Status details of a notebook server */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class NotebookStatus { public static final String SERIALIZED_NAME_NAMESPACE = "namespace"; @SerializedName(SERIALIZED_NAME_NAMESPACE) @@ -331,50 +331,6 @@ public void setPodStatus(PodStatus podStatus) { this.podStatus = podStatus; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the NotebookStatus instance itself - */ - public NotebookStatus putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -397,8 +353,7 @@ public boolean equals(Object o) { Objects.equals(this.storageLimit, notebookStatus.storageLimit) && Objects.equals(this.cpuCount, notebookStatus.cpuCount) && Objects.equals(this.cost, notebookStatus.cost) && - Objects.equals(this.podStatus, notebookStatus.podStatus)&& - Objects.equals(this.additionalProperties, notebookStatus.additionalProperties); + Objects.equals(this.podStatus, notebookStatus.podStatus); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -407,7 +362,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(namespace, uptime, cpuUsage, gpuUsage, memoryUsage, gpuLimit, memoryLimit, storageUsage, storageLimit, cpuCount, cost, podStatus, additionalProperties); + return Objects.hash(namespace, uptime, cpuUsage, gpuUsage, memoryUsage, gpuLimit, memoryLimit, storageUsage, storageLimit, cpuCount, cost, podStatus); } private static int hashCodeNullable(JsonNullable a) { @@ -433,7 +388,6 @@ public String toString() { sb.append(" cpuCount: ").append(toIndentedString(cpuCount)).append("\n"); sb.append(" cost: ").append(toIndentedString(cost)).append("\n"); sb.append(" podStatus: ").append(toIndentedString(podStatus)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -485,6 +439,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in NotebookStatus is not found in the empty JSON string", NotebookStatus.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!NotebookStatus.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `NotebookStatus` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); @@ -510,28 +472,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, NotebookStatus value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -539,28 +479,7 @@ else if (entry.getValue() instanceof Character) public NotebookStatus read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - NotebookStatus instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Organization.java b/src/main/java/io/tiledb/cloud/rest_api/model/Organization.java index d5a4402..ef48190 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Organization.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Organization.java @@ -58,7 +58,7 @@ /** * Organization */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Organization { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -456,50 +456,6 @@ public void setAssumeRoleArn(String assumeRoleArn) { this.assumeRoleArn = assumeRoleArn; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Organization instance itself - */ - public Organization putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -527,8 +483,7 @@ public boolean equals(Object o) { Objects.equals(this.defaultS3PathCredentialsName, organization.defaultS3PathCredentialsName) && Objects.equals(this.assetLocations, organization.assetLocations) && Objects.equals(this.stripeConnect, organization.stripeConnect) && - Objects.equals(this.assumeRoleArn, organization.assumeRoleArn)&& - Objects.equals(this.additionalProperties, organization.additionalProperties); + Objects.equals(this.assumeRoleArn, organization.assumeRoleArn); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -537,7 +492,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, role, name, createdAt, updatedAt, logo, description, users, allowedActions, numOfArrays, enabledFeatures, unpaidSubscription, defaultS3Path, defaultS3PathCredentialsName, assetLocations, stripeConnect, assumeRoleArn, additionalProperties); + return Objects.hash(id, role, name, createdAt, updatedAt, logo, description, users, allowedActions, numOfArrays, enabledFeatures, unpaidSubscription, defaultS3Path, defaultS3PathCredentialsName, assetLocations, stripeConnect, assumeRoleArn); } private static int hashCodeNullable(JsonNullable a) { @@ -568,7 +523,6 @@ public String toString() { sb.append(" assetLocations: ").append(toIndentedString(assetLocations)).append("\n"); sb.append(" stripeConnect: ").append(toIndentedString(stripeConnect)).append("\n"); sb.append(" assumeRoleArn: ").append(toIndentedString(assumeRoleArn)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -626,65 +580,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Organization is not found in the empty JSON string", Organization.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : Organization.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - // validate the optional field `role` - if (jsonObj.get("role") != null && !jsonObj.get("role").isJsonNull()) { - OrganizationRoles.validateJsonElement(jsonObj.get("role")); - } - if (!jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("logo") != null && !jsonObj.get("logo").isJsonNull()) && !jsonObj.get("logo").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logo` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logo").toString())); - } - if ((jsonObj.get("description") != null && !jsonObj.get("description").isJsonNull()) && !jsonObj.get("description").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `description` to be a primitive type in the JSON string but got `%s`", jsonObj.get("description").toString())); - } - if (jsonObj.get("users") != null && !jsonObj.get("users").isJsonNull()) { - JsonArray jsonArrayusers = jsonObj.getAsJsonArray("users"); - if (jsonArrayusers != null) { - // ensure the json data is an array - if (!jsonObj.get("users").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `users` to be an array in the JSON string but got `%s`", jsonObj.get("users").toString())); - } - - // validate the optional field `users` (array) - for (int i = 0; i < jsonArrayusers.size(); i++) { - OrganizationUser.validateJsonElement(jsonArrayusers.get(i)); - }; - } - } - // ensure the optional json data is an array if present - if (jsonObj.get("allowed_actions") != null && !jsonObj.get("allowed_actions").isJsonNull() && !jsonObj.get("allowed_actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `allowed_actions` to be an array in the JSON string but got `%s`", jsonObj.get("allowed_actions").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("enabled_features") != null && !jsonObj.get("enabled_features").isJsonNull() && !jsonObj.get("enabled_features").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `enabled_features` to be an array in the JSON string but got `%s`", jsonObj.get("enabled_features").toString())); - } - if ((jsonObj.get("default_s3_path") != null && !jsonObj.get("default_s3_path").isJsonNull()) && !jsonObj.get("default_s3_path").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `default_s3_path` to be a primitive type in the JSON string but got `%s`", jsonObj.get("default_s3_path").toString())); - } - if ((jsonObj.get("default_s3_path_credentials_name") != null && !jsonObj.get("default_s3_path_credentials_name").isJsonNull()) && !jsonObj.get("default_s3_path_credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `default_s3_path_credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("default_s3_path_credentials_name").toString())); - } - // validate the optional field `asset_locations` - if (jsonObj.get("asset_locations") != null && !jsonObj.get("asset_locations").isJsonNull()) { - AssetLocations.validateJsonElement(jsonObj.get("asset_locations")); - } - if ((jsonObj.get("assume_role_arn") != null && !jsonObj.get("assume_role_arn").isJsonNull()) && !jsonObj.get("assume_role_arn").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `assume_role_arn` to be a primitive type in the JSON string but got `%s`", jsonObj.get("assume_role_arn").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -702,28 +597,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Organization value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -731,28 +604,7 @@ else if (entry.getValue() instanceof Character) public Organization read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Organization instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationRoles.java b/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationRoles.java index c8af163..6a712c4 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationRoles.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationRoles.java @@ -33,6 +33,8 @@ public enum OrganizationRoles { ADMIN("admin"), + READ_WRITE_DELETE("read_write_delete"), + READ_WRITE("read_write"), READ_ONLY("read_only"); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUpdate.java b/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUpdate.java index 06aea63..5b1f3c0 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUpdate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUpdate.java @@ -51,7 +51,7 @@ /** * OrganizationUpdate */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class OrganizationUpdate { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -193,50 +193,6 @@ public void setAssetLocations(AssetLocations assetLocations) { this.assetLocations = assetLocations; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the OrganizationUpdate instance itself - */ - public OrganizationUpdate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -253,8 +209,7 @@ public boolean equals(Object o) { Objects.equals(this.description, organizationUpdate.description) && Objects.equals(this.defaultS3Path, organizationUpdate.defaultS3Path) && Objects.equals(this.defaultS3PathCredentialsName, organizationUpdate.defaultS3PathCredentialsName) && - Objects.equals(this.assetLocations, organizationUpdate.assetLocations)&& - Objects.equals(this.additionalProperties, organizationUpdate.additionalProperties); + Objects.equals(this.assetLocations, organizationUpdate.assetLocations); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -263,7 +218,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(name, logo, description, defaultS3Path, defaultS3PathCredentialsName, assetLocations, additionalProperties); + return Objects.hash(name, logo, description, defaultS3Path, defaultS3PathCredentialsName, assetLocations); } private static int hashCodeNullable(JsonNullable a) { @@ -283,7 +238,6 @@ public String toString() { sb.append(" defaultS3Path: ").append(toIndentedString(defaultS3Path)).append("\n"); sb.append(" defaultS3PathCredentialsName: ").append(toIndentedString(defaultS3PathCredentialsName)).append("\n"); sb.append(" assetLocations: ").append(toIndentedString(assetLocations)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -329,6 +283,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in OrganizationUpdate is not found in the empty JSON string", OrganizationUpdate.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!OrganizationUpdate.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `OrganizationUpdate` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); @@ -366,28 +328,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, OrganizationUpdate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -395,28 +335,7 @@ else if (entry.getValue() instanceof Character) public OrganizationUpdate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - OrganizationUpdate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUser.java b/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUser.java index 14b2330..82ea31d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUser.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/OrganizationUser.java @@ -53,7 +53,7 @@ /** * user in an organization */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class OrganizationUser { public static final String SERIALIZED_NAME_USER_ID = "user_id"; @SerializedName(SERIALIZED_NAME_USER_ID) @@ -249,50 +249,6 @@ public void setAllowedActions(List allowedActions) { this.allowedActions = allowedActions; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the OrganizationUser instance itself - */ - public OrganizationUser putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -311,13 +267,12 @@ public boolean equals(Object o) { Objects.equals(this.userEmail, organizationUser.userEmail) && Objects.equals(this.organizationName, organizationUser.organizationName) && Objects.equals(this.role, organizationUser.role) && - Objects.equals(this.allowedActions, organizationUser.allowedActions)&& - Objects.equals(this.additionalProperties, organizationUser.additionalProperties); + Objects.equals(this.allowedActions, organizationUser.allowedActions); } @Override public int hashCode() { - return Objects.hash(userId, organizationId, username, userFullName, userEmail, organizationName, role, allowedActions, additionalProperties); + return Objects.hash(userId, organizationId, username, userFullName, userEmail, organizationName, role, allowedActions); } @Override @@ -332,7 +287,6 @@ public String toString() { sb.append(" organizationName: ").append(toIndentedString(organizationName)).append("\n"); sb.append(" role: ").append(toIndentedString(role)).append("\n"); sb.append(" allowedActions: ").append(toIndentedString(allowedActions)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -380,6 +334,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in OrganizationUser is not found in the empty JSON string", OrganizationUser.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!OrganizationUser.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `OrganizationUser` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("user_id") != null && !jsonObj.get("user_id").isJsonNull()) && !jsonObj.get("user_id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `user_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("user_id").toString())); @@ -424,28 +386,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, OrganizationUser value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -453,28 +393,7 @@ else if (entry.getValue() instanceof Character) public OrganizationUser read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - OrganizationUser instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/PaginationMetadata.java b/src/main/java/io/tiledb/cloud/rest_api/model/PaginationMetadata.java index 00d412d..5188ba7 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/PaginationMetadata.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/PaginationMetadata.java @@ -50,7 +50,7 @@ /** * PaginationMetadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class PaginationMetadata { public static final String SERIALIZED_NAME_PAGE = "page"; @SerializedName(SERIALIZED_NAME_PAGE) @@ -146,50 +146,6 @@ public void setTotalItems(BigDecimal totalItems) { this.totalItems = totalItems; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the PaginationMetadata instance itself - */ - public PaginationMetadata putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -204,13 +160,12 @@ public boolean equals(Object o) { return Objects.equals(this.page, paginationMetadata.page) && Objects.equals(this.perPage, paginationMetadata.perPage) && Objects.equals(this.totalPages, paginationMetadata.totalPages) && - Objects.equals(this.totalItems, paginationMetadata.totalItems)&& - Objects.equals(this.additionalProperties, paginationMetadata.additionalProperties); + Objects.equals(this.totalItems, paginationMetadata.totalItems); } @Override public int hashCode() { - return Objects.hash(page, perPage, totalPages, totalItems, additionalProperties); + return Objects.hash(page, perPage, totalPages, totalItems); } @Override @@ -221,7 +176,6 @@ public String toString() { sb.append(" perPage: ").append(toIndentedString(perPage)).append("\n"); sb.append(" totalPages: ").append(toIndentedString(totalPages)).append("\n"); sb.append(" totalItems: ").append(toIndentedString(totalItems)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -253,22 +207,6 @@ private String toIndentedString(Object o) { openapiRequiredFields = new HashSet(); } - /** - * Validates the JSON Object and throws an exception if issues found - * - * @param jsonObj JSON Object - * @throws IOException if the JSON Object is invalid with respect to PaginationMetadata - */ - public static void validateJsonObject(JsonObject jsonObj) throws IOException { - if (jsonObj == null) { - if (io.tiledb.cloud.rest_api.v2.model.PaginationMetadata.openapiRequiredFields.isEmpty()) { - return; - } else { // has required fields - throw new IllegalArgumentException(String.format("The required field(s) %s in PaginationMetadata is not found in the empty JSON string", io.tiledb.cloud.rest_api.v2.model.PaginationMetadata.openapiRequiredFields.toString())); - } - } - } - /** * Validates the JSON Element and throws an exception if issues found * @@ -281,7 +219,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in PaginationMetadata is not found in the empty JSON string", PaginationMetadata.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -299,28 +236,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, PaginationMetadata value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -328,28 +243,7 @@ else if (entry.getValue() instanceof Character) public PaginationMetadata read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - PaginationMetadata instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Pricing.java b/src/main/java/io/tiledb/cloud/rest_api/model/Pricing.java index 5f87230..f30e307 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Pricing.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Pricing.java @@ -54,7 +54,7 @@ /** * Pricing created by converting an array to product */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Pricing { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -357,50 +357,6 @@ public void setActivated(Boolean activated) { this.activated = activated; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Pricing instance itself - */ - public Pricing putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -424,13 +380,12 @@ public boolean equals(Object o) { Objects.equals(this.interval, pricing.interval) && Objects.equals(this.dividedBy, pricing.dividedBy) && Objects.equals(this.charge, pricing.charge) && - Objects.equals(this.activated, pricing.activated)&& - Objects.equals(this.additionalProperties, pricing.additionalProperties); + Objects.equals(this.activated, pricing.activated); } @Override public int hashCode() { - return Objects.hash(id, arrayUuid, pricingName, pricingType, productName, productStatementDescriptor, productUnitLabel, currency, aggregateUsage, interval, dividedBy, charge, activated, additionalProperties); + return Objects.hash(id, arrayUuid, pricingName, pricingType, productName, productStatementDescriptor, productUnitLabel, currency, aggregateUsage, interval, dividedBy, charge, activated); } @Override @@ -450,7 +405,6 @@ public String toString() { sb.append(" dividedBy: ").append(toIndentedString(dividedBy)).append("\n"); sb.append(" charge: ").append(toIndentedString(charge)).append("\n"); sb.append(" activated: ").append(toIndentedString(activated)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -503,42 +457,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Pricing is not found in the empty JSON string", Pricing.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if ((jsonObj.get("array_uuid") != null && !jsonObj.get("array_uuid").isJsonNull()) && !jsonObj.get("array_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `array_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("array_uuid").toString())); - } - if ((jsonObj.get("pricing_name") != null && !jsonObj.get("pricing_name").isJsonNull()) && !jsonObj.get("pricing_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `pricing_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("pricing_name").toString())); - } - // validate the optional field `pricing_type` - if (jsonObj.get("pricing_type") != null && !jsonObj.get("pricing_type").isJsonNull()) { - PricingType.validateJsonElement(jsonObj.get("pricing_type")); - } - if ((jsonObj.get("product_name") != null && !jsonObj.get("product_name").isJsonNull()) && !jsonObj.get("product_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `product_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("product_name").toString())); - } - if ((jsonObj.get("product_statement_descriptor") != null && !jsonObj.get("product_statement_descriptor").isJsonNull()) && !jsonObj.get("product_statement_descriptor").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `product_statement_descriptor` to be a primitive type in the JSON string but got `%s`", jsonObj.get("product_statement_descriptor").toString())); - } - // validate the optional field `product_unit_label` - if (jsonObj.get("product_unit_label") != null && !jsonObj.get("product_unit_label").isJsonNull()) { - PricingUnitLabel.validateJsonElement(jsonObj.get("product_unit_label")); - } - // validate the optional field `currency` - if (jsonObj.get("currency") != null && !jsonObj.get("currency").isJsonNull()) { - PricingCurrency.validateJsonElement(jsonObj.get("currency")); - } - // validate the optional field `aggregate_usage` - if (jsonObj.get("aggregate_usage") != null && !jsonObj.get("aggregate_usage").isJsonNull()) { - PricingAggregateUsage.validateJsonElement(jsonObj.get("aggregate_usage")); - } - // validate the optional field `interval` - if (jsonObj.get("interval") != null && !jsonObj.get("interval").isJsonNull()) { - PricingInterval.validateJsonElement(jsonObj.get("interval")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -556,28 +474,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Pricing value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -585,28 +481,7 @@ else if (entry.getValue() instanceof Character) public Pricing read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Pricing instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Query.java b/src/main/java/io/tiledb/cloud/rest_api/model/Query.java index 98c8469..18c3cd5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Query.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Query.java @@ -57,7 +57,7 @@ /** * Query */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Query { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -276,50 +276,6 @@ public void setTotalVarLenBufferBytes(Integer totalVarLenBufferBytes) { this.totalVarLenBufferBytes = totalVarLenBufferBytes; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Query instance itself - */ - public Query putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -339,13 +295,12 @@ public boolean equals(Object o) { Objects.equals(this.reader, query.reader) && Objects.equals(this.array, query.array) && Objects.equals(this.totalFixedLengthBufferBytes, query.totalFixedLengthBufferBytes) && - Objects.equals(this.totalVarLenBufferBytes, query.totalVarLenBufferBytes)&& - Objects.equals(this.additionalProperties, query.additionalProperties); + Objects.equals(this.totalVarLenBufferBytes, query.totalVarLenBufferBytes); } @Override public int hashCode() { - return Objects.hash(type, layout, status, attributeBufferHeaders, writer, reader, array, totalFixedLengthBufferBytes, totalVarLenBufferBytes, additionalProperties); + return Objects.hash(type, layout, status, attributeBufferHeaders, writer, reader, array, totalFixedLengthBufferBytes, totalVarLenBufferBytes); } @Override @@ -361,7 +316,6 @@ public String toString() { sb.append(" array: ").append(toIndentedString(array)).append("\n"); sb.append(" totalFixedLengthBufferBytes: ").append(toIndentedString(totalFixedLengthBufferBytes)).append("\n"); sb.append(" totalVarLenBufferBytes: ").append(toIndentedString(totalVarLenBufferBytes)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -417,40 +371,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Query is not found in the empty JSON string", Query.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : Query.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the required field `type` - Querytype.validateJsonElement(jsonObj.get("type")); - // validate the required field `layout` - Layout.validateJsonElement(jsonObj.get("layout")); - // validate the required field `status` - Querystatus.validateJsonElement(jsonObj.get("status")); - // ensure the json data is an array - if (!jsonObj.get("attributeBufferHeaders").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `attributeBufferHeaders` to be an array in the JSON string but got `%s`", jsonObj.get("attributeBufferHeaders").toString())); - } - - JsonArray jsonArrayattributeBufferHeaders = jsonObj.getAsJsonArray("attributeBufferHeaders"); - // validate the required field `attributeBufferHeaders` (array) - for (int i = 0; i < jsonArrayattributeBufferHeaders.size(); i++) { - AttributeBufferHeader.validateJsonElement(jsonArrayattributeBufferHeaders.get(i)); - }; - // validate the optional field `writer` - if (jsonObj.get("writer") != null && !jsonObj.get("writer").isJsonNull()) { - Writer.validateJsonElement(jsonObj.get("writer")); - } - // validate the optional field `reader` - if (jsonObj.get("reader") != null && !jsonObj.get("reader").isJsonNull()) { - QueryReader.validateJsonElement(jsonObj.get("reader")); - } - // validate the required field `array` - Array.validateJsonElement(jsonObj.get("array")); } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -468,28 +388,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Query value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -497,28 +395,7 @@ else if (entry.getValue() instanceof Character) public Query read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Query instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/QueryJson.java b/src/main/java/io/tiledb/cloud/rest_api/model/QueryJson.java index 6af759a..81c8da4 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/QueryJson.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/QueryJson.java @@ -52,7 +52,7 @@ /** * Query returning results as JSON */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class QueryJson { public static final String SERIALIZED_NAME_QUERY_RANGES = "query_ranges"; @SerializedName(SERIALIZED_NAME_QUERY_RANGES) @@ -110,50 +110,6 @@ public void setFields(List fields) { this.fields = fields; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the QueryJson instance itself - */ - public QueryJson putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -166,13 +122,12 @@ public boolean equals(Object o) { } QueryJson queryJson = (QueryJson) o; return Objects.equals(this.queryRanges, queryJson.queryRanges) && - Objects.equals(this.fields, queryJson.fields)&& - Objects.equals(this.additionalProperties, queryJson.additionalProperties); + Objects.equals(this.fields, queryJson.fields); } @Override public int hashCode() { - return Objects.hash(queryRanges, fields, additionalProperties); + return Objects.hash(queryRanges, fields); } @Override @@ -181,7 +136,6 @@ public String toString() { sb.append("class QueryJson {\n"); sb.append(" queryRanges: ").append(toIndentedString(queryRanges)).append("\n"); sb.append(" fields: ").append(toIndentedString(fields)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -223,15 +177,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in QueryJson is not found in the empty JSON string", QueryJson.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `query_ranges` - if (jsonObj.get("query_ranges") != null && !jsonObj.get("query_ranges").isJsonNull()) { - QueryRanges.validateJsonElement(jsonObj.get("query_ranges")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("fields") != null && !jsonObj.get("fields").isJsonNull() && !jsonObj.get("fields").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `fields` to be an array in the JSON string but got `%s`", jsonObj.get("fields").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -249,28 +194,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, QueryJson value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -278,28 +201,7 @@ else if (entry.getValue() instanceof Character) public QueryJson read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - QueryJson instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/QueryRanges.java b/src/main/java/io/tiledb/cloud/rest_api/model/QueryRanges.java index db2e909..07fbea8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/QueryRanges.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/QueryRanges.java @@ -53,7 +53,7 @@ /** * Subarray bounds to query */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class QueryRanges { public static final String SERIALIZED_NAME_LAYOUT = "layout"; @SerializedName(SERIALIZED_NAME_LAYOUT) @@ -111,50 +111,6 @@ public void setRanges(List> ranges) { this.ranges = ranges; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the QueryRanges instance itself - */ - public QueryRanges putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } QueryRanges queryRanges = (QueryRanges) o; return Objects.equals(this.layout, queryRanges.layout) && - Objects.equals(this.ranges, queryRanges.ranges)&& - Objects.equals(this.additionalProperties, queryRanges.additionalProperties); + Objects.equals(this.ranges, queryRanges.ranges); } @Override public int hashCode() { - return Objects.hash(layout, ranges, additionalProperties); + return Objects.hash(layout, ranges); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class QueryRanges {\n"); sb.append(" layout: ").append(toIndentedString(layout)).append("\n"); sb.append(" ranges: ").append(toIndentedString(ranges)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,15 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in QueryRanges is not found in the empty JSON string", QueryRanges.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `layout` - if (jsonObj.get("layout") != null && !jsonObj.get("layout").isJsonNull()) { - Layout.validateJsonElement(jsonObj.get("layout")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("ranges") != null && !jsonObj.get("ranges").isJsonNull() && !jsonObj.get("ranges").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `ranges` to be an array in the JSON string but got `%s`", jsonObj.get("ranges").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -250,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, QueryRanges value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -279,28 +202,7 @@ else if (entry.getValue() instanceof Character) public QueryRanges read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - QueryRanges instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/QueryReader.java b/src/main/java/io/tiledb/cloud/rest_api/model/QueryReader.java index 52a4d8a..c05d023 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/QueryReader.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/QueryReader.java @@ -52,7 +52,7 @@ /** * Read struct (can't be called reader due to class name conflict) */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class QueryReader { public static final String SERIALIZED_NAME_LAYOUT = "layout"; @SerializedName(SERIALIZED_NAME_LAYOUT) @@ -194,50 +194,6 @@ public void setVarOffsetsBitsize(Integer varOffsetsBitsize) { this.varOffsetsBitsize = varOffsetsBitsize; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the QueryReader instance itself - */ - public QueryReader putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -254,13 +210,12 @@ public boolean equals(Object o) { Objects.equals(this.readState, queryReader.readState) && Objects.equals(this.varOffsetsMode, queryReader.varOffsetsMode) && Objects.equals(this.varOffsetsAddExtraElement, queryReader.varOffsetsAddExtraElement) && - Objects.equals(this.varOffsetsBitsize, queryReader.varOffsetsBitsize)&& - Objects.equals(this.additionalProperties, queryReader.additionalProperties); + Objects.equals(this.varOffsetsBitsize, queryReader.varOffsetsBitsize); } @Override public int hashCode() { - return Objects.hash(layout, subarray, readState, varOffsetsMode, varOffsetsAddExtraElement, varOffsetsBitsize, additionalProperties); + return Objects.hash(layout, subarray, readState, varOffsetsMode, varOffsetsAddExtraElement, varOffsetsBitsize); } @Override @@ -273,7 +228,6 @@ public String toString() { sb.append(" varOffsetsMode: ").append(toIndentedString(varOffsetsMode)).append("\n"); sb.append(" varOffsetsAddExtraElement: ").append(toIndentedString(varOffsetsAddExtraElement)).append("\n"); sb.append(" varOffsetsBitsize: ").append(toIndentedString(varOffsetsBitsize)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -319,22 +273,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in QueryReader is not found in the empty JSON string", QueryReader.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `layout` - if (jsonObj.get("layout") != null && !jsonObj.get("layout").isJsonNull()) { - Layout.validateJsonElement(jsonObj.get("layout")); - } - // validate the optional field `subarray` - if (jsonObj.get("subarray") != null && !jsonObj.get("subarray").isJsonNull()) { - Subarray.validateJsonElement(jsonObj.get("subarray")); - } - // validate the optional field `readState` - if (jsonObj.get("readState") != null && !jsonObj.get("readState").isJsonNull()) { - ReadState.validateJsonElement(jsonObj.get("readState")); - } - if ((jsonObj.get("varOffsetsMode") != null && !jsonObj.get("varOffsetsMode").isJsonNull()) && !jsonObj.get("varOffsetsMode").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `varOffsetsMode` to be a primitive type in the JSON string but got `%s`", jsonObj.get("varOffsetsMode").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -352,28 +290,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, QueryReader value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -381,28 +297,7 @@ else if (entry.getValue() instanceof Character) public QueryReader read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - QueryReader instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ReadState.java b/src/main/java/io/tiledb/cloud/rest_api/model/ReadState.java index 8c5bd25..bfa2bb7 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ReadState.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ReadState.java @@ -50,7 +50,7 @@ /** * state for reads */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ReadState { public static final String SERIALIZED_NAME_INITIALIZED = "initialized"; @SerializedName(SERIALIZED_NAME_INITIALIZED) @@ -146,50 +146,6 @@ public void setSubarrayPartitioner(SubarrayPartitioner subarrayPartitioner) { this.subarrayPartitioner = subarrayPartitioner; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ReadState instance itself - */ - public ReadState putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -204,13 +160,12 @@ public boolean equals(Object o) { return Objects.equals(this.initialized, readState.initialized) && Objects.equals(this.overflowed, readState.overflowed) && Objects.equals(this.unsplittable, readState.unsplittable) && - Objects.equals(this.subarrayPartitioner, readState.subarrayPartitioner)&& - Objects.equals(this.additionalProperties, readState.additionalProperties); + Objects.equals(this.subarrayPartitioner, readState.subarrayPartitioner); } @Override public int hashCode() { - return Objects.hash(initialized, overflowed, unsplittable, subarrayPartitioner, additionalProperties); + return Objects.hash(initialized, overflowed, unsplittable, subarrayPartitioner); } @Override @@ -221,7 +176,6 @@ public String toString() { sb.append(" overflowed: ").append(toIndentedString(overflowed)).append("\n"); sb.append(" unsplittable: ").append(toIndentedString(unsplittable)).append("\n"); sb.append(" subarrayPartitioner: ").append(toIndentedString(subarrayPartitioner)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,11 +219,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ReadState is not found in the empty JSON string", ReadState.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `subarrayPartitioner` - if (jsonObj.get("subarrayPartitioner") != null && !jsonObj.get("subarrayPartitioner").isJsonNull()) { - SubarrayPartitioner.validateJsonElement(jsonObj.get("subarrayPartitioner")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -287,28 +236,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ReadState value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -316,28 +243,7 @@ else if (entry.getValue() instanceof Character) public ReadState read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ReadState instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/RegisteredTaskGraph.java b/src/main/java/io/tiledb/cloud/rest_api/model/RegisteredTaskGraph.java index 87dc568..c842525 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/RegisteredTaskGraph.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/RegisteredTaskGraph.java @@ -53,7 +53,7 @@ /** * The structure and metadata of a task graph that can be stored on TileDB Cloud and executed by users who have access to it. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class RegisteredTaskGraph { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) @@ -257,50 +257,6 @@ public void setNodes(List nodes) { this.nodes = nodes; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the RegisteredTaskGraph instance itself - */ - public RegisteredTaskGraph putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -319,8 +275,7 @@ public boolean equals(Object o) { Objects.equals(this.licenseId, registeredTaskGraph.licenseId) && Objects.equals(this.licenseText, registeredTaskGraph.licenseText) && Objects.equals(this.tags, registeredTaskGraph.tags) && - Objects.equals(this.nodes, registeredTaskGraph.nodes)&& - Objects.equals(this.additionalProperties, registeredTaskGraph.additionalProperties); + Objects.equals(this.nodes, registeredTaskGraph.nodes); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -329,7 +284,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(uuid, namespace, name, readme, licenseId, licenseText, tags, nodes, additionalProperties); + return Objects.hash(uuid, namespace, name, readme, licenseId, licenseText, tags, nodes); } private static int hashCodeNullable(JsonNullable a) { @@ -351,7 +306,6 @@ public String toString() { sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" nodes: ").append(toIndentedString(nodes)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -399,43 +353,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in RegisteredTaskGraph is not found in the empty JSON string", RegisteredTaskGraph.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("uuid") != null && !jsonObj.get("uuid").isJsonNull()) && !jsonObj.get("uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uuid").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("readme") != null && !jsonObj.get("readme").isJsonNull()) && !jsonObj.get("readme").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `readme` to be a primitive type in the JSON string but got `%s`", jsonObj.get("readme").toString())); - } - if ((jsonObj.get("license_id") != null && !jsonObj.get("license_id").isJsonNull()) && !jsonObj.get("license_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_id").toString())); - } - if ((jsonObj.get("license_text") != null && !jsonObj.get("license_text").isJsonNull()) && !jsonObj.get("license_text").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `license_text` to be a primitive type in the JSON string but got `%s`", jsonObj.get("license_text").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("tags") != null && !jsonObj.get("tags").isJsonNull() && !jsonObj.get("tags").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `tags` to be an array in the JSON string but got `%s`", jsonObj.get("tags").toString())); - } - if (jsonObj.get("nodes") != null && !jsonObj.get("nodes").isJsonNull()) { - JsonArray jsonArraynodes = jsonObj.getAsJsonArray("nodes"); - if (jsonArraynodes != null) { - // ensure the json data is an array - if (!jsonObj.get("nodes").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `nodes` to be an array in the JSON string but got `%s`", jsonObj.get("nodes").toString())); - } - - // validate the optional field `nodes` (array) - for (int i = 0; i < jsonArraynodes.size(); i++) { - TaskGraphNode.validateJsonElement(jsonArraynodes.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -453,28 +370,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, RegisteredTaskGraph value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -482,28 +377,7 @@ else if (entry.getValue() instanceof Character) public RegisteredTaskGraph read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - RegisteredTaskGraph instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/ResetUserPasswordRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/ResetUserPasswordRequest.java index c0f1c46..f9f9654 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/ResetUserPasswordRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/ResetUserPasswordRequest.java @@ -49,7 +49,7 @@ /** * Password to update */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class ResetUserPasswordRequest { public static final String SERIALIZED_NAME_PASSWORD = "password"; @SerializedName(SERIALIZED_NAME_PASSWORD) @@ -76,50 +76,6 @@ public void setPassword(String password) { this.password = password; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the ResetUserPasswordRequest instance itself - */ - public ResetUserPasswordRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -131,13 +87,12 @@ public boolean equals(Object o) { return false; } ResetUserPasswordRequest resetUserPasswordRequest = (ResetUserPasswordRequest) o; - return Objects.equals(this.password, resetUserPasswordRequest.password)&& - Objects.equals(this.additionalProperties, resetUserPasswordRequest.additionalProperties); + return Objects.equals(this.password, resetUserPasswordRequest.password); } @Override public int hashCode() { - return Objects.hash(password, additionalProperties); + return Objects.hash(password); } @Override @@ -145,7 +100,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ResetUserPasswordRequest {\n"); sb.append(" password: ").append(toIndentedString(password)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -186,6 +140,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in ResetUserPasswordRequest is not found in the empty JSON string", ResetUserPasswordRequest.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!ResetUserPasswordRequest.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `ResetUserPasswordRequest` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("password") != null && !jsonObj.get("password").isJsonNull()) && !jsonObj.get("password").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `password` to be a primitive type in the JSON string but got `%s`", jsonObj.get("password").toString())); @@ -207,28 +169,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, ResetUserPasswordRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -236,28 +176,7 @@ else if (entry.getValue() instanceof Character) public ResetUserPasswordRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - ResetUserPasswordRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/RetryStrategy.java b/src/main/java/io/tiledb/cloud/rest_api/model/RetryStrategy.java index 1d8acba..9188def 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/RetryStrategy.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/RetryStrategy.java @@ -51,7 +51,7 @@ /** * RetryStrategy provides controls on how to retry a taskgraph node */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class RetryStrategy { public static final String SERIALIZED_NAME_BACKOFF = "backoff"; @SerializedName(SERIALIZED_NAME_BACKOFF) @@ -147,50 +147,6 @@ public void setRetryPolicy(RetryPolicy retryPolicy) { this.retryPolicy = retryPolicy; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the RetryStrategy instance itself - */ - public RetryStrategy putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -205,13 +161,12 @@ public boolean equals(Object o) { return Objects.equals(this.backoff, retryStrategy.backoff) && Objects.equals(this.expression, retryStrategy.expression) && Objects.equals(this.limit, retryStrategy.limit) && - Objects.equals(this.retryPolicy, retryStrategy.retryPolicy)&& - Objects.equals(this.additionalProperties, retryStrategy.additionalProperties); + Objects.equals(this.retryPolicy, retryStrategy.retryPolicy); } @Override public int hashCode() { - return Objects.hash(backoff, expression, limit, retryPolicy, additionalProperties); + return Objects.hash(backoff, expression, limit, retryPolicy); } @Override @@ -222,7 +177,6 @@ public String toString() { sb.append(" expression: ").append(toIndentedString(expression)).append("\n"); sb.append(" limit: ").append(toIndentedString(limit)).append("\n"); sb.append(" retryPolicy: ").append(toIndentedString(retryPolicy)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -266,6 +220,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in RetryStrategy is not found in the empty JSON string", RetryStrategy.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!RetryStrategy.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `RetryStrategy` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `backoff` if (jsonObj.get("backoff") != null && !jsonObj.get("backoff").isJsonNull()) { @@ -295,28 +257,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, RetryStrategy value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -324,28 +264,7 @@ else if (entry.getValue() instanceof Character) public RetryStrategy read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - RetryStrategy instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SQLParameters.java b/src/main/java/io/tiledb/cloud/rest_api/model/SQLParameters.java index 4c63642..5f31704 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SQLParameters.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SQLParameters.java @@ -52,7 +52,7 @@ /** * Parameters for running sql query */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SQLParameters { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -325,50 +325,6 @@ public void setClientNodeUuid(String clientNodeUuid) { this.clientNodeUuid = clientNodeUuid; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SQLParameters instance itself - */ - public SQLParameters putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -390,13 +346,12 @@ public boolean equals(Object o) { Objects.equals(this.initCommands, sqLParameters.initCommands) && Objects.equals(this.parameters, sqLParameters.parameters) && Objects.equals(this.taskGraphUuid, sqLParameters.taskGraphUuid) && - Objects.equals(this.clientNodeUuid, sqLParameters.clientNodeUuid)&& - Objects.equals(this.additionalProperties, sqLParameters.additionalProperties); + Objects.equals(this.clientNodeUuid, sqLParameters.clientNodeUuid); } @Override public int hashCode() { - return Objects.hash(name, query, outputUri, storeResults, dontDownloadResults, resourceClass, resultFormat, initCommands, parameters, taskGraphUuid, clientNodeUuid, additionalProperties); + return Objects.hash(name, query, outputUri, storeResults, dontDownloadResults, resourceClass, resultFormat, initCommands, parameters, taskGraphUuid, clientNodeUuid); } @Override @@ -414,7 +369,6 @@ public String toString() { sb.append(" parameters: ").append(toIndentedString(parameters)).append("\n"); sb.append(" taskGraphUuid: ").append(toIndentedString(taskGraphUuid)).append("\n"); sb.append(" clientNodeUuid: ").append(toIndentedString(clientNodeUuid)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -465,6 +419,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SQLParameters is not found in the empty JSON string", SQLParameters.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!SQLParameters.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `SQLParameters` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); @@ -513,28 +475,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SQLParameters value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -542,28 +482,7 @@ else if (entry.getValue() instanceof Character) public SQLParameters read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SQLParameters instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfig.java b/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfig.java index 38d0496..894e9d3 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfig.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfig.java @@ -55,7 +55,7 @@ /** * The information used to set up a single-sign on connection to a customer domain. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SSODomainConfig { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) @@ -251,50 +251,6 @@ public void setCheckResults(List checkResults) { this.checkResults = checkResults; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SSODomainConfig instance itself - */ - public SSODomainConfig putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -313,8 +269,7 @@ public boolean equals(Object o) { Objects.equals(this.oidcClientSecret, ssODomainConfig.oidcClientSecret) && Objects.equals(this.domainSetup, ssODomainConfig.domainSetup) && Objects.equals(this.verificationStatus, ssODomainConfig.verificationStatus) && - Objects.equals(this.checkResults, ssODomainConfig.checkResults)&& - Objects.equals(this.additionalProperties, ssODomainConfig.additionalProperties); + Objects.equals(this.checkResults, ssODomainConfig.checkResults); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -323,7 +278,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(uuid, domain, oidcIssuer, oidcClientId, oidcClientSecret, domainSetup, verificationStatus, checkResults, additionalProperties); + return Objects.hash(uuid, domain, oidcIssuer, oidcClientId, oidcClientSecret, domainSetup, verificationStatus, checkResults); } private static int hashCodeNullable(JsonNullable a) { @@ -345,7 +300,6 @@ public String toString() { sb.append(" domainSetup: ").append(toIndentedString(domainSetup)).append("\n"); sb.append(" verificationStatus: ").append(toIndentedString(verificationStatus)).append("\n"); sb.append(" checkResults: ").append(toIndentedString(checkResults)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -393,6 +347,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SSODomainConfig is not found in the empty JSON string", SSODomainConfig.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!SSODomainConfig.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `SSODomainConfig` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("uuid") != null && !jsonObj.get("uuid").isJsonNull()) && !jsonObj.get("uuid").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uuid").toString())); @@ -448,28 +410,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SSODomainConfig value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -477,28 +417,7 @@ else if (entry.getValue() instanceof Character) public SSODomainConfig read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SSODomainConfig instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfigResponse.java b/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfigResponse.java index 4e2cdfc..fffe1b8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfigResponse.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainConfigResponse.java @@ -52,7 +52,7 @@ /** * The response to a request for the list of domain claims associated with a particular organization. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SSODomainConfigResponse { public static final String SERIALIZED_NAME_DOMAIN_CONFIGS = "domain_configs"; @SerializedName(SERIALIZED_NAME_DOMAIN_CONFIGS) @@ -87,50 +87,6 @@ public void setDomainConfigs(List domainConfigs) { this.domainConfigs = domainConfigs; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SSODomainConfigResponse instance itself - */ - public SSODomainConfigResponse putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } SSODomainConfigResponse ssODomainConfigResponse = (SSODomainConfigResponse) o; - return Objects.equals(this.domainConfigs, ssODomainConfigResponse.domainConfigs)&& - Objects.equals(this.additionalProperties, ssODomainConfigResponse.additionalProperties); + return Objects.equals(this.domainConfigs, ssODomainConfigResponse.domainConfigs); } @Override public int hashCode() { - return Objects.hash(domainConfigs, additionalProperties); + return Objects.hash(domainConfigs); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SSODomainConfigResponse {\n"); sb.append(" domainConfigs: ").append(toIndentedString(domainConfigs)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SSODomainConfigResponse is not found in the empty JSON string", SSODomainConfigResponse.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("domain_configs") != null && !jsonObj.get("domain_configs").isJsonNull()) { - JsonArray jsonArraydomainConfigs = jsonObj.getAsJsonArray("domain_configs"); - if (jsonArraydomainConfigs != null) { - // ensure the json data is an array - if (!jsonObj.get("domain_configs").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `domain_configs` to be an array in the JSON string but got `%s`", jsonObj.get("domain_configs").toString())); - } - - // validate the optional field `domain_configs` (array) - for (int i = 0; i < jsonArraydomainConfigs.size(); i++) { - SSODomainConfig.validateJsonElement(jsonArraydomainConfigs.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SSODomainConfigResponse value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public SSODomainConfigResponse read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SSODomainConfigResponse instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainSetup.java b/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainSetup.java index 94d9127..a0f7927 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainSetup.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SSODomainSetup.java @@ -49,7 +49,7 @@ /** * Configuration settings to verify ownership of a given domain. At least one of these must be completed enable user login from the domain. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SSODomainSetup { public static final String SERIALIZED_NAME_TXT = "txt"; @SerializedName(SERIALIZED_NAME_TXT) @@ -122,50 +122,6 @@ public void setCnameDst(String cnameDst) { this.cnameDst = cnameDst; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SSODomainSetup instance itself - */ - public SSODomainSetup putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { SSODomainSetup ssODomainSetup = (SSODomainSetup) o; return Objects.equals(this.txt, ssODomainSetup.txt) && Objects.equals(this.cnameSrc, ssODomainSetup.cnameSrc) && - Objects.equals(this.cnameDst, ssODomainSetup.cnameDst)&& - Objects.equals(this.additionalProperties, ssODomainSetup.additionalProperties); + Objects.equals(this.cnameDst, ssODomainSetup.cnameDst); } @Override public int hashCode() { - return Objects.hash(txt, cnameSrc, cnameDst, additionalProperties); + return Objects.hash(txt, cnameSrc, cnameDst); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" txt: ").append(toIndentedString(txt)).append("\n"); sb.append(" cnameSrc: ").append(toIndentedString(cnameSrc)).append("\n"); sb.append(" cnameDst: ").append(toIndentedString(cnameDst)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,16 +192,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SSODomainSetup is not found in the empty JSON string", SSODomainSetup.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("txt") != null && !jsonObj.get("txt").isJsonNull()) && !jsonObj.get("txt").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `txt` to be a primitive type in the JSON string but got `%s`", jsonObj.get("txt").toString())); - } - if ((jsonObj.get("cname_src") != null && !jsonObj.get("cname_src").isJsonNull()) && !jsonObj.get("cname_src").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `cname_src` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cname_src").toString())); - } - if ((jsonObj.get("cname_dst") != null && !jsonObj.get("cname_dst").isJsonNull()) && !jsonObj.get("cname_dst").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `cname_dst` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cname_dst").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -265,28 +209,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SSODomainSetup value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +216,7 @@ else if (entry.getValue() instanceof Character) public SSODomainSetup read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SSODomainSetup instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SharePaymentRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/SharePaymentRequest.java index f3c175d..befe0b5 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SharePaymentRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SharePaymentRequest.java @@ -51,7 +51,7 @@ /** * SharePaymentRequest */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SharePaymentRequest { public static final String SERIALIZED_NAME_NAMESPACES = "namespaces"; @SerializedName(SERIALIZED_NAME_NAMESPACES) @@ -86,50 +86,6 @@ public void setNamespaces(List namespaces) { this.namespaces = namespaces; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SharePaymentRequest instance itself - */ - public SharePaymentRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -141,13 +97,12 @@ public boolean equals(Object o) { return false; } SharePaymentRequest sharePaymentRequest = (SharePaymentRequest) o; - return Objects.equals(this.namespaces, sharePaymentRequest.namespaces)&& - Objects.equals(this.additionalProperties, sharePaymentRequest.additionalProperties); + return Objects.equals(this.namespaces, sharePaymentRequest.namespaces); } @Override public int hashCode() { - return Objects.hash(namespaces, additionalProperties); + return Objects.hash(namespaces); } @Override @@ -155,7 +110,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class SharePaymentRequest {\n"); sb.append(" namespaces: ").append(toIndentedString(namespaces)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -196,11 +150,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SharePaymentRequest is not found in the empty JSON string", SharePaymentRequest.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the optional json data is an array if present - if (jsonObj.get("namespaces") != null && !jsonObj.get("namespaces").isJsonNull() && !jsonObj.get("namespaces").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `namespaces` to be an array in the JSON string but got `%s`", jsonObj.get("namespaces").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -218,28 +167,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SharePaymentRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -247,28 +174,7 @@ else if (entry.getValue() instanceof Character) public SharePaymentRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SharePaymentRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SingleFragmentInfo.java b/src/main/java/io/tiledb/cloud/rest_api/model/SingleFragmentInfo.java index bc5fa0d..da84925 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SingleFragmentInfo.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SingleFragmentInfo.java @@ -50,7 +50,7 @@ /** * Single Fragment info of an array */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SingleFragmentInfo { public static final String SERIALIZED_NAME_ARRAY_SCHEMA_NAME = "ArraySchemaName"; @SerializedName(SERIALIZED_NAME_ARRAY_SCHEMA_NAME) @@ -100,50 +100,6 @@ public void setMeta(FragmentMetadata meta) { this.meta = meta; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SingleFragmentInfo instance itself - */ - public SingleFragmentInfo putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -156,13 +112,12 @@ public boolean equals(Object o) { } SingleFragmentInfo singleFragmentInfo = (SingleFragmentInfo) o; return Objects.equals(this.arraySchemaName, singleFragmentInfo.arraySchemaName) && - Objects.equals(this.meta, singleFragmentInfo.meta)&& - Objects.equals(this.additionalProperties, singleFragmentInfo.additionalProperties); + Objects.equals(this.meta, singleFragmentInfo.meta); } @Override public int hashCode() { - return Objects.hash(arraySchemaName, meta, additionalProperties); + return Objects.hash(arraySchemaName, meta); } @Override @@ -171,7 +126,6 @@ public String toString() { sb.append("class SingleFragmentInfo {\n"); sb.append(" arraySchemaName: ").append(toIndentedString(arraySchemaName)).append("\n"); sb.append(" meta: ").append(toIndentedString(meta)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -213,14 +167,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SingleFragmentInfo is not found in the empty JSON string", SingleFragmentInfo.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("ArraySchemaName") != null && !jsonObj.get("ArraySchemaName").isJsonNull()) && !jsonObj.get("ArraySchemaName").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `ArraySchemaName` to be a primitive type in the JSON string but got `%s`", jsonObj.get("ArraySchemaName").toString())); - } - // validate the optional field `meta` - if (jsonObj.get("meta") != null && !jsonObj.get("meta").isJsonNull()) { - FragmentMetadata.validateJsonElement(jsonObj.get("meta")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -238,28 +184,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SingleFragmentInfo value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -267,28 +191,7 @@ else if (entry.getValue() instanceof Character) public SingleFragmentInfo read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SingleFragmentInfo instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/StorageLocation.java b/src/main/java/io/tiledb/cloud/rest_api/model/StorageLocation.java index 938bdea..644cb06 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/StorageLocation.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/StorageLocation.java @@ -50,7 +50,7 @@ /** * The path at which a given asset will be stored, and the credentials used to access that asset. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class StorageLocation { public static final String SERIALIZED_NAME_PATH = "path"; @SerializedName(SERIALIZED_NAME_PATH) @@ -100,50 +100,6 @@ public void setCredentialsName(String credentialsName) { this.credentialsName = credentialsName; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the StorageLocation instance itself - */ - public StorageLocation putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -156,8 +112,7 @@ public boolean equals(Object o) { } StorageLocation storageLocation = (StorageLocation) o; return Objects.equals(this.path, storageLocation.path) && - Objects.equals(this.credentialsName, storageLocation.credentialsName)&& - Objects.equals(this.additionalProperties, storageLocation.additionalProperties); + Objects.equals(this.credentialsName, storageLocation.credentialsName); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -166,7 +121,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(path, credentialsName, additionalProperties); + return Objects.hash(path, credentialsName); } private static int hashCodeNullable(JsonNullable a) { @@ -182,7 +137,6 @@ public String toString() { sb.append("class StorageLocation {\n"); sb.append(" path: ").append(toIndentedString(path)).append("\n"); sb.append(" credentialsName: ").append(toIndentedString(credentialsName)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,13 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in StorageLocation is not found in the empty JSON string", StorageLocation.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("path") != null && !jsonObj.get("path").isJsonNull()) && !jsonObj.get("path").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `path` to be a primitive type in the JSON string but got `%s`", jsonObj.get("path").toString())); - } - if ((jsonObj.get("credentials_name") != null && !jsonObj.get("credentials_name").isJsonNull()) && !jsonObj.get("credentials_name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `credentials_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("credentials_name").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -248,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, StorageLocation value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -277,28 +202,7 @@ else if (entry.getValue() instanceof Character) public StorageLocation read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - StorageLocation instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Subarray.java b/src/main/java/io/tiledb/cloud/rest_api/model/Subarray.java index a29f6b2..09b80a8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Subarray.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Subarray.java @@ -53,7 +53,7 @@ /** * A Subarray */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Subarray { public static final String SERIALIZED_NAME_LAYOUT = "layout"; @SerializedName(SERIALIZED_NAME_LAYOUT) @@ -111,50 +111,6 @@ public void setRanges(List ranges) { this.ranges = ranges; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Subarray instance itself - */ - public Subarray putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } Subarray subarray = (Subarray) o; return Objects.equals(this.layout, subarray.layout) && - Objects.equals(this.ranges, subarray.ranges)&& - Objects.equals(this.additionalProperties, subarray.additionalProperties); + Objects.equals(this.ranges, subarray.ranges); } @Override public int hashCode() { - return Objects.hash(layout, ranges, additionalProperties); + return Objects.hash(layout, ranges); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class Subarray {\n"); sb.append(" layout: ").append(toIndentedString(layout)).append("\n"); sb.append(" ranges: ").append(toIndentedString(ranges)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,25 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Subarray is not found in the empty JSON string", Subarray.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `layout` - if (jsonObj.get("layout") != null && !jsonObj.get("layout").isJsonNull()) { - Layout.validateJsonElement(jsonObj.get("layout")); - } - if (jsonObj.get("ranges") != null && !jsonObj.get("ranges").isJsonNull()) { - JsonArray jsonArrayranges = jsonObj.getAsJsonArray("ranges"); - if (jsonArrayranges != null) { - // ensure the json data is an array - if (!jsonObj.get("ranges").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `ranges` to be an array in the JSON string but got `%s`", jsonObj.get("ranges").toString())); - } - - // validate the optional field `ranges` (array) - for (int i = 0; i < jsonArrayranges.size(); i++) { - SubarrayRanges.validateJsonElement(jsonArrayranges.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -260,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Subarray value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +202,7 @@ else if (entry.getValue() instanceof Character) public Subarray read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Subarray instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitioner.java b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitioner.java index bd1aefc..82733ec 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitioner.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitioner.java @@ -55,7 +55,7 @@ /** * The subarray partitioner */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SubarrayPartitioner { public static final String SERIALIZED_NAME_SUBARRAY = "subarray"; @SerializedName(SERIALIZED_NAME_SUBARRAY) @@ -205,50 +205,6 @@ public void setMemoryBudgetVar(Integer memoryBudgetVar) { this.memoryBudgetVar = memoryBudgetVar; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SubarrayPartitioner instance itself - */ - public SubarrayPartitioner putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -265,13 +221,12 @@ public boolean equals(Object o) { Objects.equals(this.current, subarrayPartitioner.current) && Objects.equals(this.state, subarrayPartitioner.state) && Objects.equals(this.memoryBudget, subarrayPartitioner.memoryBudget) && - Objects.equals(this.memoryBudgetVar, subarrayPartitioner.memoryBudgetVar)&& - Objects.equals(this.additionalProperties, subarrayPartitioner.additionalProperties); + Objects.equals(this.memoryBudgetVar, subarrayPartitioner.memoryBudgetVar); } @Override public int hashCode() { - return Objects.hash(subarray, budget, current, state, memoryBudget, memoryBudgetVar, additionalProperties); + return Objects.hash(subarray, budget, current, state, memoryBudget, memoryBudgetVar); } @Override @@ -284,7 +239,6 @@ public String toString() { sb.append(" state: ").append(toIndentedString(state)).append("\n"); sb.append(" memoryBudget: ").append(toIndentedString(memoryBudget)).append("\n"); sb.append(" memoryBudgetVar: ").append(toIndentedString(memoryBudgetVar)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -330,33 +284,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SubarrayPartitioner is not found in the empty JSON string", SubarrayPartitioner.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `subarray` - if (jsonObj.get("subarray") != null && !jsonObj.get("subarray").isJsonNull()) { - Subarray.validateJsonElement(jsonObj.get("subarray")); - } - if (jsonObj.get("budget") != null && !jsonObj.get("budget").isJsonNull()) { - JsonArray jsonArraybudget = jsonObj.getAsJsonArray("budget"); - if (jsonArraybudget != null) { - // ensure the json data is an array - if (!jsonObj.get("budget").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `budget` to be an array in the JSON string but got `%s`", jsonObj.get("budget").toString())); - } - - // validate the optional field `budget` (array) - for (int i = 0; i < jsonArraybudget.size(); i++) { - AttributeBufferSize.validateJsonElement(jsonArraybudget.get(i)); - }; - } - } - // validate the optional field `current` - if (jsonObj.get("current") != null && !jsonObj.get("current").isJsonNull()) { - SubarrayPartitionerCurrent.validateJsonElement(jsonObj.get("current")); - } - // validate the optional field `state` - if (jsonObj.get("state") != null && !jsonObj.get("state").isJsonNull()) { - SubarrayPartitionerState.validateJsonElement(jsonObj.get("state")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -374,28 +301,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SubarrayPartitioner value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -403,28 +308,7 @@ else if (entry.getValue() instanceof Character) public SubarrayPartitioner read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SubarrayPartitioner instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerCurrent.java b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerCurrent.java index fe2fc02..e2c9c46 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerCurrent.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerCurrent.java @@ -50,7 +50,7 @@ /** * The current partition info */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SubarrayPartitionerCurrent { public static final String SERIALIZED_NAME_SUBARRAY = "subarray"; @SerializedName(SERIALIZED_NAME_SUBARRAY) @@ -146,50 +146,6 @@ public void setSplitMultiRange(Boolean splitMultiRange) { this.splitMultiRange = splitMultiRange; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SubarrayPartitionerCurrent instance itself - */ - public SubarrayPartitionerCurrent putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -204,13 +160,12 @@ public boolean equals(Object o) { return Objects.equals(this.subarray, subarrayPartitionerCurrent.subarray) && Objects.equals(this.start, subarrayPartitionerCurrent.start) && Objects.equals(this.end, subarrayPartitionerCurrent.end) && - Objects.equals(this.splitMultiRange, subarrayPartitionerCurrent.splitMultiRange)&& - Objects.equals(this.additionalProperties, subarrayPartitionerCurrent.additionalProperties); + Objects.equals(this.splitMultiRange, subarrayPartitionerCurrent.splitMultiRange); } @Override public int hashCode() { - return Objects.hash(subarray, start, end, splitMultiRange, additionalProperties); + return Objects.hash(subarray, start, end, splitMultiRange); } @Override @@ -221,7 +176,6 @@ public String toString() { sb.append(" start: ").append(toIndentedString(start)).append("\n"); sb.append(" end: ").append(toIndentedString(end)).append("\n"); sb.append(" splitMultiRange: ").append(toIndentedString(splitMultiRange)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,6 +219,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SubarrayPartitionerCurrent is not found in the empty JSON string", SubarrayPartitionerCurrent.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!SubarrayPartitionerCurrent.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `SubarrayPartitionerCurrent` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `subarray` if (jsonObj.get("subarray") != null && !jsonObj.get("subarray").isJsonNull()) { @@ -287,28 +249,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SubarrayPartitionerCurrent value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -316,28 +256,7 @@ else if (entry.getValue() instanceof Character) public SubarrayPartitionerCurrent read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SubarrayPartitionerCurrent instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerState.java b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerState.java index f8712ee..986df85 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerState.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayPartitionerState.java @@ -52,7 +52,7 @@ /** * The state information for the remaining partitions to be produced */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SubarrayPartitionerState { public static final String SERIALIZED_NAME_START = "start"; @SerializedName(SERIALIZED_NAME_START) @@ -164,50 +164,6 @@ public void setMultiRange(List multiRange) { this.multiRange = multiRange; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SubarrayPartitionerState instance itself - */ - public SubarrayPartitionerState putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -222,13 +178,12 @@ public boolean equals(Object o) { return Objects.equals(this.start, subarrayPartitionerState.start) && Objects.equals(this.end, subarrayPartitionerState.end) && Objects.equals(this.singleRange, subarrayPartitionerState.singleRange) && - Objects.equals(this.multiRange, subarrayPartitionerState.multiRange)&& - Objects.equals(this.additionalProperties, subarrayPartitionerState.additionalProperties); + Objects.equals(this.multiRange, subarrayPartitionerState.multiRange); } @Override public int hashCode() { - return Objects.hash(start, end, singleRange, multiRange, additionalProperties); + return Objects.hash(start, end, singleRange, multiRange); } @Override @@ -239,7 +194,6 @@ public String toString() { sb.append(" end: ").append(toIndentedString(end)).append("\n"); sb.append(" singleRange: ").append(toIndentedString(singleRange)).append("\n"); sb.append(" multiRange: ").append(toIndentedString(multiRange)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -283,35 +237,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SubarrayPartitionerState is not found in the empty JSON string", SubarrayPartitionerState.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("singleRange") != null && !jsonObj.get("singleRange").isJsonNull()) { - JsonArray jsonArraysingleRange = jsonObj.getAsJsonArray("singleRange"); - if (jsonArraysingleRange != null) { - // ensure the json data is an array - if (!jsonObj.get("singleRange").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `singleRange` to be an array in the JSON string but got `%s`", jsonObj.get("singleRange").toString())); - } - - // validate the optional field `singleRange` (array) - for (int i = 0; i < jsonArraysingleRange.size(); i++) { - Subarray.validateJsonElement(jsonArraysingleRange.get(i)); - }; - } - } - if (jsonObj.get("multiRange") != null && !jsonObj.get("multiRange").isJsonNull()) { - JsonArray jsonArraymultiRange = jsonObj.getAsJsonArray("multiRange"); - if (jsonArraymultiRange != null) { - // ensure the json data is an array - if (!jsonObj.get("multiRange").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `multiRange` to be an array in the JSON string but got `%s`", jsonObj.get("multiRange").toString())); - } - - // validate the optional field `multiRange` (array) - for (int i = 0; i < jsonArraymultiRange.size(); i++) { - Subarray.validateJsonElement(jsonArraymultiRange.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -329,28 +254,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SubarrayPartitionerState value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -358,28 +261,7 @@ else if (entry.getValue() instanceof Character) public SubarrayPartitionerState read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SubarrayPartitionerState instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayRanges.java b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayRanges.java index 023d9fd..3d8c761 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayRanges.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/SubarrayRanges.java @@ -52,7 +52,7 @@ /** * A set of 1D ranges for a subarray */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class SubarrayRanges { public static final String SERIALIZED_NAME_TYPE = "type"; @SerializedName(SERIALIZED_NAME_TYPE) @@ -133,50 +133,6 @@ public void setBuffer(List buffer) { this.buffer = buffer; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the SubarrayRanges instance itself - */ - public SubarrayRanges putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -190,13 +146,12 @@ public boolean equals(Object o) { SubarrayRanges subarrayRanges = (SubarrayRanges) o; return Objects.equals(this.type, subarrayRanges.type) && Objects.equals(this.hasDefaultRange, subarrayRanges.hasDefaultRange) && - Objects.equals(this.buffer, subarrayRanges.buffer)&& - Objects.equals(this.additionalProperties, subarrayRanges.additionalProperties); + Objects.equals(this.buffer, subarrayRanges.buffer); } @Override public int hashCode() { - return Objects.hash(type, hasDefaultRange, buffer, additionalProperties); + return Objects.hash(type, hasDefaultRange, buffer); } @Override @@ -206,7 +161,6 @@ public String toString() { sb.append(" type: ").append(toIndentedString(type)).append("\n"); sb.append(" hasDefaultRange: ").append(toIndentedString(hasDefaultRange)).append("\n"); sb.append(" buffer: ").append(toIndentedString(buffer)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -249,15 +203,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in SubarrayRanges is not found in the empty JSON string", SubarrayRanges.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // validate the optional field `type` - if (jsonObj.get("type") != null && !jsonObj.get("type").isJsonNull()) { - Datatype.validateJsonElement(jsonObj.get("type")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("buffer") != null && !jsonObj.get("buffer").isJsonNull() && !jsonObj.get("buffer").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `buffer` to be an array in the JSON string but got `%s`", jsonObj.get("buffer").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -275,28 +220,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, SubarrayRanges value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -304,28 +227,7 @@ else if (entry.getValue() instanceof Character) public SubarrayRanges read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - SubarrayRanges instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Subscription.java b/src/main/java/io/tiledb/cloud/rest_api/model/Subscription.java index b4558e4..930db30 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Subscription.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Subscription.java @@ -52,7 +52,7 @@ /** * Subscription of a user (customer) to another user's arrays */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Subscription { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -156,50 +156,6 @@ public void setPricing(List pricing) { this.pricing = pricing; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Subscription instance itself - */ - public Subscription putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -214,13 +170,12 @@ public boolean equals(Object o) { return Objects.equals(this.id, subscription.id) && Objects.equals(this.ownerNamespaceUuid, subscription.ownerNamespaceUuid) && Objects.equals(this.customerNamespaceUuid, subscription.customerNamespaceUuid) && - Objects.equals(this.pricing, subscription.pricing)&& - Objects.equals(this.additionalProperties, subscription.additionalProperties); + Objects.equals(this.pricing, subscription.pricing); } @Override public int hashCode() { - return Objects.hash(id, ownerNamespaceUuid, customerNamespaceUuid, pricing, additionalProperties); + return Objects.hash(id, ownerNamespaceUuid, customerNamespaceUuid, pricing); } @Override @@ -231,7 +186,6 @@ public String toString() { sb.append(" ownerNamespaceUuid: ").append(toIndentedString(ownerNamespaceUuid)).append("\n"); sb.append(" customerNamespaceUuid: ").append(toIndentedString(customerNamespaceUuid)).append("\n"); sb.append(" pricing: ").append(toIndentedString(pricing)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -275,30 +229,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Subscription is not found in the empty JSON string", Subscription.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if ((jsonObj.get("owner_namespace_uuid") != null && !jsonObj.get("owner_namespace_uuid").isJsonNull()) && !jsonObj.get("owner_namespace_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `owner_namespace_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("owner_namespace_uuid").toString())); - } - if ((jsonObj.get("customer_namespace_uuid") != null && !jsonObj.get("customer_namespace_uuid").isJsonNull()) && !jsonObj.get("customer_namespace_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `customer_namespace_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("customer_namespace_uuid").toString())); - } - if (jsonObj.get("pricing") != null && !jsonObj.get("pricing").isJsonNull()) { - JsonArray jsonArraypricing = jsonObj.getAsJsonArray("pricing"); - if (jsonArraypricing != null) { - // ensure the json data is an array - if (!jsonObj.get("pricing").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `pricing` to be an array in the JSON string but got `%s`", jsonObj.get("pricing").toString())); - } - - // validate the optional field `pricing` (array) - for (int i = 0; i < jsonArraypricing.size(); i++) { - Pricing.validateJsonElement(jsonArraypricing.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -316,28 +246,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Subscription value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -345,28 +253,7 @@ else if (entry.getValue() instanceof Character) public Subscription read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Subscription instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGArrayNodeData.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGArrayNodeData.java index 99f5119..12b1fc4 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGArrayNodeData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGArrayNodeData.java @@ -50,7 +50,7 @@ /** * The details of an array that should be queried and provided as the input to a UDF Node. This is essentially a `UDFArrayDetails`, but you’re allowed to provide most of the values as Nodes if you want. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGArrayNodeData { public static final String SERIALIZED_NAME_URI = "uri"; @SerializedName(SERIALIZED_NAME_URI) @@ -123,50 +123,6 @@ public void setBuffers(Object buffers) { this.buffers = buffers; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGArrayNodeData instance itself - */ - public TGArrayNodeData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -180,13 +136,12 @@ public boolean equals(Object o) { TGArrayNodeData tgArrayNodeData = (TGArrayNodeData) o; return Objects.equals(this.uri, tgArrayNodeData.uri) && Objects.equals(this.ranges, tgArrayNodeData.ranges) && - Objects.equals(this.buffers, tgArrayNodeData.buffers)&& - Objects.equals(this.additionalProperties, tgArrayNodeData.additionalProperties); + Objects.equals(this.buffers, tgArrayNodeData.buffers); } @Override public int hashCode() { - return Objects.hash(uri, ranges, buffers, additionalProperties); + return Objects.hash(uri, ranges, buffers); } @Override @@ -196,7 +151,6 @@ public String toString() { sb.append(" uri: ").append(toIndentedString(uri)).append("\n"); sb.append(" ranges: ").append(toIndentedString(ranges)).append("\n"); sb.append(" buffers: ").append(toIndentedString(buffers)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -239,6 +193,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGArrayNodeData is not found in the empty JSON string", TGArrayNodeData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TGArrayNodeData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TGArrayNodeData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `ranges` if (jsonObj.get("ranges") != null && !jsonObj.get("ranges").isJsonNull()) { @@ -261,28 +223,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGArrayNodeData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -290,28 +230,7 @@ else if (entry.getValue() instanceof Character) public TGArrayNodeData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGArrayNodeData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGInputNodeData.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGInputNodeData.java index 453929a..382e791 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGInputNodeData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGInputNodeData.java @@ -50,7 +50,7 @@ /** * Specifies that a node is an “input value”, allowing for parameterized task graphs. An input node may not depend upon any other nodes. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGInputNodeData { public static final String SERIALIZED_NAME_DEFAULT_VALUE = "default_value"; @SerializedName(SERIALIZED_NAME_DEFAULT_VALUE) @@ -100,50 +100,6 @@ public void setDatatype(String datatype) { this.datatype = datatype; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGInputNodeData instance itself - */ - public TGInputNodeData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -156,8 +112,7 @@ public boolean equals(Object o) { } TGInputNodeData tgInputNodeData = (TGInputNodeData) o; return Objects.equals(this.defaultValue, tgInputNodeData.defaultValue) && - Objects.equals(this.datatype, tgInputNodeData.datatype)&& - Objects.equals(this.additionalProperties, tgInputNodeData.additionalProperties); + Objects.equals(this.datatype, tgInputNodeData.datatype); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -166,7 +121,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(defaultValue, datatype, additionalProperties); + return Objects.hash(defaultValue, datatype); } private static int hashCodeNullable(JsonNullable a) { @@ -182,7 +137,6 @@ public String toString() { sb.append("class TGInputNodeData {\n"); sb.append(" defaultValue: ").append(toIndentedString(defaultValue)).append("\n"); sb.append(" datatype: ").append(toIndentedString(datatype)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGInputNodeData is not found in the empty JSON string", TGInputNodeData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TGInputNodeData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TGInputNodeData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("datatype") != null && !jsonObj.get("datatype").isJsonNull()) && !jsonObj.get("datatype").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `datatype` to be a primitive type in the JSON string but got `%s`", jsonObj.get("datatype").toString())); @@ -245,28 +207,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGInputNodeData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -274,28 +214,7 @@ else if (entry.getValue() instanceof Character) public TGInputNodeData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGInputNodeData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGQueryRanges.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGQueryRanges.java index 30ef336..978aa05 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGQueryRanges.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGQueryRanges.java @@ -50,7 +50,7 @@ /** * Parameterizable version of `QueryRanges`. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGQueryRanges { public static final String SERIALIZED_NAME_LAYOUT = "layout"; @SerializedName(SERIALIZED_NAME_LAYOUT) @@ -123,50 +123,6 @@ public void setRanges(Object ranges) { this.ranges = ranges; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGQueryRanges instance itself - */ - public TGQueryRanges putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -180,13 +136,12 @@ public boolean equals(Object o) { TGQueryRanges tgQueryRanges = (TGQueryRanges) o; return Objects.equals(this.layout, tgQueryRanges.layout) && Objects.equals(this.friendlyRanges, tgQueryRanges.friendlyRanges) && - Objects.equals(this.ranges, tgQueryRanges.ranges)&& - Objects.equals(this.additionalProperties, tgQueryRanges.additionalProperties); + Objects.equals(this.ranges, tgQueryRanges.ranges); } @Override public int hashCode() { - return Objects.hash(layout, friendlyRanges, ranges, additionalProperties); + return Objects.hash(layout, friendlyRanges, ranges); } @Override @@ -196,7 +151,6 @@ public String toString() { sb.append(" layout: ").append(toIndentedString(layout)).append("\n"); sb.append(" friendlyRanges: ").append(toIndentedString(friendlyRanges)).append("\n"); sb.append(" ranges: ").append(toIndentedString(ranges)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -239,6 +193,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGQueryRanges is not found in the empty JSON string", TGQueryRanges.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TGQueryRanges.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TGQueryRanges` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `layout` if (jsonObj.get("layout") != null && !jsonObj.get("layout").isJsonNull()) { @@ -261,28 +223,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGQueryRanges value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -290,28 +230,7 @@ else if (entry.getValue() instanceof Character) public TGQueryRanges read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGQueryRanges instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGSQLNodeData.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGSQLNodeData.java index 283243e..cf90ffc 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGSQLNodeData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGSQLNodeData.java @@ -53,7 +53,7 @@ /** * A node specifying an SQL query to execute in TileDB Cloud. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGSQLNodeData { public static final String SERIALIZED_NAME_INIT_COMMANDS = "init_commands"; @SerializedName(SERIALIZED_NAME_INIT_COMMANDS) @@ -188,50 +188,6 @@ public void setNamespace(String namespace) { this.namespace = namespace; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGSQLNodeData instance itself - */ - public TGSQLNodeData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -247,8 +203,7 @@ public boolean equals(Object o) { Objects.equals(this.query, tgSQLNodeData.query) && Objects.equals(this.parameters, tgSQLNodeData.parameters) && Objects.equals(this.resultFormat, tgSQLNodeData.resultFormat) && - Objects.equals(this.namespace, tgSQLNodeData.namespace)&& - Objects.equals(this.additionalProperties, tgSQLNodeData.additionalProperties); + Objects.equals(this.namespace, tgSQLNodeData.namespace); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -257,7 +212,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(initCommands, query, parameters, resultFormat, namespace, additionalProperties); + return Objects.hash(initCommands, query, parameters, resultFormat, namespace); } private static int hashCodeNullable(JsonNullable a) { @@ -276,7 +231,6 @@ public String toString() { sb.append(" parameters: ").append(toIndentedString(parameters)).append("\n"); sb.append(" resultFormat: ").append(toIndentedString(resultFormat)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -321,25 +275,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGSQLNodeData is not found in the empty JSON string", TGSQLNodeData.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the optional json data is an array if present - if (jsonObj.get("init_commands") != null && !jsonObj.get("init_commands").isJsonNull() && !jsonObj.get("init_commands").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `init_commands` to be an array in the JSON string but got `%s`", jsonObj.get("init_commands").toString())); - } - if ((jsonObj.get("query") != null && !jsonObj.get("query").isJsonNull()) && !jsonObj.get("query").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `query` to be a primitive type in the JSON string but got `%s`", jsonObj.get("query").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("parameters") != null && !jsonObj.get("parameters").isJsonNull() && !jsonObj.get("parameters").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `parameters` to be an array in the JSON string but got `%s`", jsonObj.get("parameters").toString())); - } - // validate the optional field `result_format` - if (jsonObj.get("result_format") != null && !jsonObj.get("result_format").isJsonNull()) { - ResultFormat.validateJsonElement(jsonObj.get("result_format")); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -357,28 +292,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGSQLNodeData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -386,28 +299,7 @@ else if (entry.getValue() instanceof Character) public TGSQLNodeData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGSQLNodeData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFArgument.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFArgument.java index 1209bb1..668c138 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFArgument.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFArgument.java @@ -50,7 +50,7 @@ /** * A single argument to a UDF. This may represent a positional argument or a named argument, depending upon whether `name` is set. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGUDFArgument { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -100,50 +100,6 @@ public void setValue(Object value) { this.value = value; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGUDFArgument instance itself - */ - public TGUDFArgument putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -156,8 +112,7 @@ public boolean equals(Object o) { } TGUDFArgument tgUDFArgument = (TGUDFArgument) o; return Objects.equals(this.name, tgUDFArgument.name) && - Objects.equals(this.value, tgUDFArgument.value)&& - Objects.equals(this.additionalProperties, tgUDFArgument.additionalProperties); + Objects.equals(this.value, tgUDFArgument.value); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -166,7 +121,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(name, value, additionalProperties); + return Objects.hash(name, value); } private static int hashCodeNullable(JsonNullable a) { @@ -182,7 +137,6 @@ public String toString() { sb.append("class TGUDFArgument {\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" value: ").append(toIndentedString(value)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,10 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGUDFArgument is not found in the empty JSON string", TGUDFArgument.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -245,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGUDFArgument value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -274,28 +202,7 @@ else if (entry.getValue() instanceof Character) public TGUDFArgument read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGUDFArgument instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironment.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironment.java index 79168f6..96063e7 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironment.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironment.java @@ -20,6 +20,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import io.tiledb.cloud.rest_api.model.TGUDFEnvironmentResources; +import io.tiledb.cloud.rest_api.model.TGUDFStorage; import io.tiledb.cloud.rest_api.model.UDFLanguage; import java.io.IOException; import java.math.BigDecimal; @@ -55,7 +56,7 @@ /** * Metadata about the environment where we want to execute a UDF. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGUDFEnvironment { public static final String SERIALIZED_NAME_LANGUAGE = "language"; @SerializedName(SERIALIZED_NAME_LANGUAGE) @@ -95,7 +96,7 @@ public class TGUDFEnvironment { public static final String SERIALIZED_NAME_STORAGE = "storage"; @SerializedName(SERIALIZED_NAME_STORAGE) - private List storage = new ArrayList<>(); + private List storage = new ArrayList<>(); public TGUDFEnvironment() { } @@ -271,12 +272,12 @@ public void setTimeout(BigDecimal timeout) { } - public TGUDFEnvironment storage(List storage) { + public TGUDFEnvironment storage(List storage) { this.storage = storage; return this; } - public TGUDFEnvironment addStorageItem(Object storageItem) { + public TGUDFEnvironment addStorageItem(TGUDFStorage storageItem) { if (this.storage == null) { this.storage = new ArrayList<>(); } @@ -285,62 +286,18 @@ public TGUDFEnvironment addStorageItem(Object storageItem) { } /** - * Storage options for mounting persistent volumes + * Storage options for mounting persistent volumes. * @return storage */ @javax.annotation.Nullable - public List getStorage() { + public List getStorage() { return storage; } - public void setStorage(List storage) { + public void setStorage(List storage) { this.storage = storage; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGUDFEnvironment instance itself - */ - public TGUDFEnvironment putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -361,8 +318,7 @@ public boolean equals(Object o) { Objects.equals(this.resources, tgUDFEnvironment.resources) && Objects.equals(this.runClientSide, tgUDFEnvironment.runClientSide) && Objects.equals(this.timeout, tgUDFEnvironment.timeout) && - Objects.equals(this.storage, tgUDFEnvironment.storage)&& - Objects.equals(this.additionalProperties, tgUDFEnvironment.additionalProperties); + Objects.equals(this.storage, tgUDFEnvironment.storage); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -371,7 +327,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(language, languageVersion, imageName, accessCredentialsName, namespace, resourceClass, resources, runClientSide, timeout, storage, additionalProperties); + return Objects.hash(language, languageVersion, imageName, accessCredentialsName, namespace, resourceClass, resources, runClientSide, timeout, storage); } private static int hashCodeNullable(JsonNullable a) { @@ -395,7 +351,6 @@ public String toString() { sb.append(" runClientSide: ").append(toIndentedString(runClientSide)).append("\n"); sb.append(" timeout: ").append(toIndentedString(timeout)).append("\n"); sb.append(" storage: ").append(toIndentedString(storage)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -445,6 +400,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGUDFEnvironment is not found in the empty JSON string", TGUDFEnvironment.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TGUDFEnvironment.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TGUDFEnvironment` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `language` if (jsonObj.get("language") != null && !jsonObj.get("language").isJsonNull()) { @@ -469,9 +432,19 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti if (jsonObj.get("resources") != null && !jsonObj.get("resources").isJsonNull()) { TGUDFEnvironmentResources.validateJsonElement(jsonObj.get("resources")); } - // ensure the optional json data is an array if present - if (jsonObj.get("storage") != null && !jsonObj.get("storage").isJsonNull() && !jsonObj.get("storage").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `storage` to be an array in the JSON string but got `%s`", jsonObj.get("storage").toString())); + if (jsonObj.get("storage") != null && !jsonObj.get("storage").isJsonNull()) { + JsonArray jsonArraystorage = jsonObj.getAsJsonArray("storage"); + if (jsonArraystorage != null) { + // ensure the json data is an array + if (!jsonObj.get("storage").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `storage` to be an array in the JSON string but got `%s`", jsonObj.get("storage").toString())); + } + + // validate the optional field `storage` (array) + for (int i = 0; i < jsonArraystorage.size(); i++) { + TGUDFStorage.validateJsonElement(jsonArraystorage.get(i)); + }; + } } } @@ -490,28 +463,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGUDFEnvironment value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -519,28 +470,7 @@ else if (entry.getValue() instanceof Character) public TGUDFEnvironment read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGUDFEnvironment instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentResources.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentResources.java index 26b8868..d7a1e57 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentResources.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentResources.java @@ -49,7 +49,7 @@ /** * The resources requested for this particular node. If resources are not specified resource_class is used, if it is not set the standard resource // defaults are used */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGUDFEnvironmentResources { public static final String SERIALIZED_NAME_CPU = "cpu"; @SerializedName(SERIALIZED_NAME_CPU) @@ -122,50 +122,6 @@ public void setGpu(Integer gpu) { this.gpu = gpu; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGUDFEnvironmentResources instance itself - */ - public TGUDFEnvironmentResources putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { TGUDFEnvironmentResources tgUDFEnvironmentResources = (TGUDFEnvironmentResources) o; return Objects.equals(this.cpu, tgUDFEnvironmentResources.cpu) && Objects.equals(this.memory, tgUDFEnvironmentResources.memory) && - Objects.equals(this.gpu, tgUDFEnvironmentResources.gpu)&& - Objects.equals(this.additionalProperties, tgUDFEnvironmentResources.additionalProperties); + Objects.equals(this.gpu, tgUDFEnvironmentResources.gpu); } @Override public int hashCode() { - return Objects.hash(cpu, memory, gpu, additionalProperties); + return Objects.hash(cpu, memory, gpu); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" cpu: ").append(toIndentedString(cpu)).append("\n"); sb.append(" memory: ").append(toIndentedString(memory)).append("\n"); sb.append(" gpu: ").append(toIndentedString(gpu)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGUDFEnvironmentResources is not found in the empty JSON string", TGUDFEnvironmentResources.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TGUDFEnvironmentResources.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TGUDFEnvironmentResources` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("cpu") != null && !jsonObj.get("cpu").isJsonNull()) && !jsonObj.get("cpu").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `cpu` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cpu").toString())); @@ -262,28 +224,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGUDFEnvironmentResources value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -291,28 +231,7 @@ else if (entry.getValue() instanceof Character) public TGUDFEnvironmentResources read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGUDFEnvironmentResources instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFNodeData.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFNodeData.java index 7097528..484ba10 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFNodeData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFNodeData.java @@ -55,7 +55,7 @@ /** * A node specifying the execution of a user-defined function. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGUDFNodeData { public static final String SERIALIZED_NAME_REGISTERED_UDF_NAME = "registered_udf_name"; @SerializedName(SERIALIZED_NAME_REGISTERED_UDF_NAME) @@ -205,50 +205,6 @@ public void setResultFormat(ResultFormat resultFormat) { this.resultFormat = resultFormat; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGUDFNodeData instance itself - */ - public TGUDFNodeData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -265,8 +221,7 @@ public boolean equals(Object o) { Objects.equals(this.sourceText, tgUDFNodeData.sourceText) && Objects.equals(this.environment, tgUDFNodeData.environment) && Objects.equals(this.arguments, tgUDFNodeData.arguments) && - Objects.equals(this.resultFormat, tgUDFNodeData.resultFormat)&& - Objects.equals(this.additionalProperties, tgUDFNodeData.additionalProperties); + Objects.equals(this.resultFormat, tgUDFNodeData.resultFormat); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -275,7 +230,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(registeredUdfName, executableCode, sourceText, environment, arguments, resultFormat, additionalProperties); + return Objects.hash(registeredUdfName, executableCode, sourceText, environment, arguments, resultFormat); } private static int hashCodeNullable(JsonNullable a) { @@ -295,7 +250,6 @@ public String toString() { sb.append(" environment: ").append(toIndentedString(environment)).append("\n"); sb.append(" arguments: ").append(toIndentedString(arguments)).append("\n"); sb.append(" resultFormat: ").append(toIndentedString(resultFormat)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -341,6 +295,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGUDFNodeData is not found in the empty JSON string", TGUDFNodeData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TGUDFNodeData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TGUDFNodeData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("registered_udf_name") != null && !jsonObj.get("registered_udf_name").isJsonNull()) && !jsonObj.get("registered_udf_name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `registered_udf_name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("registered_udf_name").toString())); @@ -390,28 +352,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGUDFNodeData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -419,28 +359,7 @@ else if (entry.getValue() instanceof Character) public TGUDFNodeData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGUDFNodeData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFStorage.java b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFStorage.java index 17a0f5e..cd59e23 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFStorage.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TGUDFStorage.java @@ -47,14 +47,18 @@ import io.tiledb.cloud.rest_api.JSON; /** - * Storage mount details + * Storage options for mounting persistent volumes. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TGUDFStorage { public static final String SERIALIZED_NAME_PATH = "path"; @SerializedName(SERIALIZED_NAME_PATH) private String path; + public static final String SERIALIZED_NAME_TILEDB_URI = "tiledb_uri"; + @SerializedName(SERIALIZED_NAME_TILEDB_URI) + private String tiledbUri; + public static final String SERIALIZED_NAME_SIZE = "size"; @SerializedName(SERIALIZED_NAME_SIZE) private String size; @@ -72,7 +76,7 @@ public TGUDFStorage path(String path) { } /** - * mount path + * Mount path for the attached volume. * @return path */ @javax.annotation.Nullable @@ -85,13 +89,32 @@ public void setPath(String path) { } + public TGUDFStorage tiledbUri(String tiledbUri) { + this.tiledbUri = tiledbUri; + return this; + } + + /** + * TileDB filesystem to mount + * @return tiledbUri + */ + @javax.annotation.Nullable + public String getTiledbUri() { + return tiledbUri; + } + + public void setTiledbUri(String tiledbUri) { + this.tiledbUri = tiledbUri; + } + + public TGUDFStorage size(String size) { this.size = size; return this; } /** - * storage size in bytes + * Storage size. * @return size */ @javax.annotation.Nullable @@ -110,7 +133,7 @@ public TGUDFStorage storageClass(String storageClass) { } /** - * storage class + * Storage class to use for creating the volume. * @return storageClass */ @javax.annotation.Nullable @@ -122,50 +145,6 @@ public void setStorageClass(String storageClass) { this.storageClass = storageClass; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TGUDFStorage instance itself - */ - public TGUDFStorage putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -178,14 +157,14 @@ public boolean equals(Object o) { } TGUDFStorage tgUDFStorage = (TGUDFStorage) o; return Objects.equals(this.path, tgUDFStorage.path) && + Objects.equals(this.tiledbUri, tgUDFStorage.tiledbUri) && Objects.equals(this.size, tgUDFStorage.size) && - Objects.equals(this.storageClass, tgUDFStorage.storageClass)&& - Objects.equals(this.additionalProperties, tgUDFStorage.additionalProperties); + Objects.equals(this.storageClass, tgUDFStorage.storageClass); } @Override public int hashCode() { - return Objects.hash(path, size, storageClass, additionalProperties); + return Objects.hash(path, tiledbUri, size, storageClass); } @Override @@ -193,9 +172,9 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TGUDFStorage {\n"); sb.append(" path: ").append(toIndentedString(path)).append("\n"); + sb.append(" tiledbUri: ").append(toIndentedString(tiledbUri)).append("\n"); sb.append(" size: ").append(toIndentedString(size)).append("\n"); sb.append(" storageClass: ").append(toIndentedString(storageClass)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -219,6 +198,7 @@ private String toIndentedString(Object o) { // a set of all properties/fields (JSON key names) openapiFields = new HashSet(); openapiFields.add("path"); + openapiFields.add("tiledb_uri"); openapiFields.add("size"); openapiFields.add("storage_class"); @@ -238,13 +218,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TGUDFStorage is not found in the empty JSON string", TGUDFStorage.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("path") != null && !jsonObj.get("path").isJsonNull()) && !jsonObj.get("path").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `path` to be a primitive type in the JSON string but got `%s`", jsonObj.get("path").toString())); - } - if ((jsonObj.get("storage_class") != null && !jsonObj.get("storage_class").isJsonNull()) && !jsonObj.get("storage_class").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `storage_class` to be a primitive type in the JSON string but got `%s`", jsonObj.get("storage_class").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -262,28 +235,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TGUDFStorage value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -291,28 +242,7 @@ else if (entry.getValue() instanceof Character) public TGUDFStorage read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TGUDFStorage instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraph.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraph.java index fba920d..9964774 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraph.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraph.java @@ -56,7 +56,7 @@ /** * Information about a task graph. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraph { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) @@ -285,50 +285,6 @@ public void setTaskGraphType(TaskGraphType taskGraphType) { this.taskGraphType = taskGraphType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraph instance itself - */ - public TaskGraph putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -349,8 +305,7 @@ public boolean equals(Object o) { Objects.equals(this.parallelism, taskGraph.parallelism) && Objects.equals(this.retryStrategy, taskGraph.retryStrategy) && Objects.equals(this.deadline, taskGraph.deadline) && - Objects.equals(this.taskGraphType, taskGraph.taskGraphType)&& - Objects.equals(this.additionalProperties, taskGraph.additionalProperties); + Objects.equals(this.taskGraphType, taskGraph.taskGraphType); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -359,7 +314,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(uuid, namespace, createdBy, name, createdAt, nodes, parallelism, retryStrategy, deadline, taskGraphType, additionalProperties); + return Objects.hash(uuid, namespace, createdBy, name, createdAt, nodes, parallelism, retryStrategy, deadline, taskGraphType); } private static int hashCodeNullable(JsonNullable a) { @@ -383,7 +338,6 @@ public String toString() { sb.append(" retryStrategy: ").append(toIndentedString(retryStrategy)).append("\n"); sb.append(" deadline: ").append(toIndentedString(deadline)).append("\n"); sb.append(" taskGraphType: ").append(toIndentedString(taskGraphType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -433,41 +387,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraph is not found in the empty JSON string", TaskGraph.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("uuid") != null && !jsonObj.get("uuid").isJsonNull()) && !jsonObj.get("uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uuid").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("created_by") != null && !jsonObj.get("created_by").isJsonNull()) && !jsonObj.get("created_by").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `created_by` to be a primitive type in the JSON string but got `%s`", jsonObj.get("created_by").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if (jsonObj.get("nodes") != null && !jsonObj.get("nodes").isJsonNull()) { - JsonArray jsonArraynodes = jsonObj.getAsJsonArray("nodes"); - if (jsonArraynodes != null) { - // ensure the json data is an array - if (!jsonObj.get("nodes").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `nodes` to be an array in the JSON string but got `%s`", jsonObj.get("nodes").toString())); - } - - // validate the optional field `nodes` (array) - for (int i = 0; i < jsonArraynodes.size(); i++) { - TaskGraphNode.validateJsonElement(jsonArraynodes.get(i)); - }; - } - } - // validate the optional field `retry_strategy` - if (jsonObj.get("retry_strategy") != null && !jsonObj.get("retry_strategy").isJsonNull()) { - RetryStrategy.validateJsonElement(jsonObj.get("retry_strategy")); - } - // validate the optional field `task_graph_type` - if (jsonObj.get("task_graph_type") != null && !jsonObj.get("task_graph_type").isJsonNull()) { - TaskGraphType.validateJsonElement(jsonObj.get("task_graph_type")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -485,28 +404,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraph value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -514,28 +411,7 @@ else if (entry.getValue() instanceof Character) public TaskGraph read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraph instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphClientNodeStatus.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphClientNodeStatus.java index 5356fb4..52a4721 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphClientNodeStatus.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphClientNodeStatus.java @@ -50,7 +50,7 @@ /** * A report of the execution status of a node that ran on the client side. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphClientNodeStatus { public static final String SERIALIZED_NAME_CLIENT_NODE_UUID = "client_node_uuid"; @SerializedName(SERIALIZED_NAME_CLIENT_NODE_UUID) @@ -100,50 +100,6 @@ public void setStatus(ArrayTaskStatus status) { this.status = status; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphClientNodeStatus instance itself - */ - public TaskGraphClientNodeStatus putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -156,13 +112,12 @@ public boolean equals(Object o) { } TaskGraphClientNodeStatus taskGraphClientNodeStatus = (TaskGraphClientNodeStatus) o; return Objects.equals(this.clientNodeUuid, taskGraphClientNodeStatus.clientNodeUuid) && - Objects.equals(this.status, taskGraphClientNodeStatus.status)&& - Objects.equals(this.additionalProperties, taskGraphClientNodeStatus.additionalProperties); + Objects.equals(this.status, taskGraphClientNodeStatus.status); } @Override public int hashCode() { - return Objects.hash(clientNodeUuid, status, additionalProperties); + return Objects.hash(clientNodeUuid, status); } @Override @@ -171,7 +126,6 @@ public String toString() { sb.append("class TaskGraphClientNodeStatus {\n"); sb.append(" clientNodeUuid: ").append(toIndentedString(clientNodeUuid)).append("\n"); sb.append(" status: ").append(toIndentedString(status)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -213,6 +167,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphClientNodeStatus is not found in the empty JSON string", TaskGraphClientNodeStatus.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TaskGraphClientNodeStatus.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TaskGraphClientNodeStatus` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("client_node_uuid") != null && !jsonObj.get("client_node_uuid").isJsonNull()) && !jsonObj.get("client_node_uuid").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `client_node_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("client_node_uuid").toString())); @@ -238,28 +200,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphClientNodeStatus value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -267,28 +207,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphClientNodeStatus read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphClientNodeStatus instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLog.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLog.java index 7801e40..4216b7b 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLog.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLog.java @@ -59,7 +59,7 @@ /** * Logging information about the execution of a task graph. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphLog { public static final String SERIALIZED_NAME_UUID = "uuid"; @SerializedName(SERIALIZED_NAME_UUID) @@ -133,6 +133,14 @@ public class TaskGraphLog { @SerializedName(SERIALIZED_NAME_CLOUD_REGION) private String cloudRegion; + public static final String SERIALIZED_NAME_ROOT_TASK_GRAPH_UUID = "root_task_graph_uuid"; + @SerializedName(SERIALIZED_NAME_ROOT_TASK_GRAPH_UUID) + private String rootTaskGraphUuid; + + public static final String SERIALIZED_NAME_CHILDREN_TASK_GRAPH_UUIDS = "children_task_graph_uuids"; + @SerializedName(SERIALIZED_NAME_CHILDREN_TASK_GRAPH_UUIDS) + private List childrenTaskGraphUuids = new ArrayList<>(); + public TaskGraphLog() { } @@ -468,52 +476,54 @@ public void setCloudRegion(String cloudRegion) { this.cloudRegion = cloudRegion; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; + + public TaskGraphLog rootTaskGraphUuid(String rootTaskGraphUuid) { + this.rootTaskGraphUuid = rootTaskGraphUuid; + return this; + } /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphLog instance itself + * The UUID of the root taskgraph that this taskgraph is related to. This is used to provide consistent tracking and UI view for graphs that are executed by a set of taskgraphs. + * @return rootTaskGraphUuid */ - public TaskGraphLog putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); + @javax.annotation.Nullable + public String getRootTaskGraphUuid() { + return rootTaskGraphUuid; + } + + public void setRootTaskGraphUuid(String rootTaskGraphUuid) { + this.rootTaskGraphUuid = rootTaskGraphUuid; + } + + + public TaskGraphLog childrenTaskGraphUuids(List childrenTaskGraphUuids) { + this.childrenTaskGraphUuids = childrenTaskGraphUuids; + return this; + } + + public TaskGraphLog addChildrenTaskGraphUuidsItem(String childrenTaskGraphUuidsItem) { + if (this.childrenTaskGraphUuids == null) { + this.childrenTaskGraphUuids = new ArrayList<>(); } - this.additionalProperties.put(key, value); + this.childrenTaskGraphUuids.add(childrenTaskGraphUuidsItem); return this; } /** - * Return the additional (undeclared) property. - * - * @return a map of objects + * If this is a root taskgraph, this contains the list of all its children taskgraph UUIDs. + * @return childrenTaskGraphUuids */ - public Map getAdditionalProperties() { - return additionalProperties; + @javax.annotation.Nullable + public List getChildrenTaskGraphUuids() { + return childrenTaskGraphUuids; } - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); + public void setChildrenTaskGraphUuids(List childrenTaskGraphUuids) { + this.childrenTaskGraphUuids = childrenTaskGraphUuids; } + @Override public boolean equals(Object o) { if (this == o) { @@ -540,8 +550,9 @@ public boolean equals(Object o) { Objects.equals(this.taskGraphType, taskGraphLog.taskGraphType) && Objects.equals(this.taskGraphId, taskGraphLog.taskGraphId) && Objects.equals(this.cloudProvider, taskGraphLog.cloudProvider) && - Objects.equals(this.cloudRegion, taskGraphLog.cloudRegion)&& - Objects.equals(this.additionalProperties, taskGraphLog.additionalProperties); + Objects.equals(this.cloudRegion, taskGraphLog.cloudRegion) && + Objects.equals(this.rootTaskGraphUuid, taskGraphLog.rootTaskGraphUuid) && + Objects.equals(this.childrenTaskGraphUuids, taskGraphLog.childrenTaskGraphUuids); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -550,7 +561,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(uuid, namespace, createdBy, name, createdAt, startTime, endTime, status, totalCost, accessCost, egressCost, executionTime, statusCount, nodes, taskGraphType, taskGraphId, cloudProvider, cloudRegion, additionalProperties); + return Objects.hash(uuid, namespace, createdBy, name, createdAt, startTime, endTime, status, totalCost, accessCost, egressCost, executionTime, statusCount, nodes, taskGraphType, taskGraphId, cloudProvider, cloudRegion, rootTaskGraphUuid, childrenTaskGraphUuids); } private static int hashCodeNullable(JsonNullable a) { @@ -582,7 +593,8 @@ public String toString() { sb.append(" taskGraphId: ").append(toIndentedString(taskGraphId)).append("\n"); sb.append(" cloudProvider: ").append(toIndentedString(cloudProvider)).append("\n"); sb.append(" cloudRegion: ").append(toIndentedString(cloudRegion)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append(" rootTaskGraphUuid: ").append(toIndentedString(rootTaskGraphUuid)).append("\n"); + sb.append(" childrenTaskGraphUuids: ").append(toIndentedString(childrenTaskGraphUuids)).append("\n"); sb.append("}"); return sb.toString(); } @@ -623,6 +635,8 @@ private String toIndentedString(Object o) { openapiFields.add("task_graph_id"); openapiFields.add("cloud_provider"); openapiFields.add("cloud_region"); + openapiFields.add("root_task_graph_uuid"); + openapiFields.add("children_task_graph_uuids"); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(); @@ -640,53 +654,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphLog is not found in the empty JSON string", TaskGraphLog.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("uuid") != null && !jsonObj.get("uuid").isJsonNull()) && !jsonObj.get("uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uuid").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("created_by") != null && !jsonObj.get("created_by").isJsonNull()) && !jsonObj.get("created_by").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `created_by` to be a primitive type in the JSON string but got `%s`", jsonObj.get("created_by").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - // validate the optional field `status` - if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { - TaskGraphLogStatus.validateJsonElement(jsonObj.get("status")); - } - if ((jsonObj.get("execution_time") != null && !jsonObj.get("execution_time").isJsonNull()) && !jsonObj.get("execution_time").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `execution_time` to be a primitive type in the JSON string but got `%s`", jsonObj.get("execution_time").toString())); - } - if (jsonObj.get("nodes") != null && !jsonObj.get("nodes").isJsonNull()) { - JsonArray jsonArraynodes = jsonObj.getAsJsonArray("nodes"); - if (jsonArraynodes != null) { - // ensure the json data is an array - if (!jsonObj.get("nodes").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `nodes` to be an array in the JSON string but got `%s`", jsonObj.get("nodes").toString())); - } - - // validate the optional field `nodes` (array) - for (int i = 0; i < jsonArraynodes.size(); i++) { - TaskGraphNodeMetadata.validateJsonElement(jsonArraynodes.get(i)); - }; - } - } - // validate the optional field `task_graph_type` - if (jsonObj.get("task_graph_type") != null && !jsonObj.get("task_graph_type").isJsonNull()) { - TaskGraphType.validateJsonElement(jsonObj.get("task_graph_type")); - } - if ((jsonObj.get("task_graph_id") != null && !jsonObj.get("task_graph_id").isJsonNull()) && !jsonObj.get("task_graph_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `task_graph_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("task_graph_id").toString())); - } - if ((jsonObj.get("cloud_provider") != null && !jsonObj.get("cloud_provider").isJsonNull()) && !jsonObj.get("cloud_provider").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `cloud_provider` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cloud_provider").toString())); - } - if ((jsonObj.get("cloud_region") != null && !jsonObj.get("cloud_region").isJsonNull()) && !jsonObj.get("cloud_region").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `cloud_region` to be a primitive type in the JSON string but got `%s`", jsonObj.get("cloud_region").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -704,28 +671,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphLog value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -733,28 +678,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphLog read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphLog instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLogsData.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLogsData.java index bcd5a2d..a754e69 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLogsData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphLogsData.java @@ -53,7 +53,7 @@ /** * Response data for a task graph list, including pagination metadata. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphLogsData { public static final String SERIALIZED_NAME_TASK_GRAPH_LOGS = "task_graph_logs"; @SerializedName(SERIALIZED_NAME_TASK_GRAPH_LOGS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphLogsData instance itself - */ - public TaskGraphLogsData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } TaskGraphLogsData taskGraphLogsData = (TaskGraphLogsData) o; return Objects.equals(this.taskGraphLogs, taskGraphLogsData.taskGraphLogs) && - Objects.equals(this.paginationMetadata, taskGraphLogsData.paginationMetadata)&& - Objects.equals(this.additionalProperties, taskGraphLogsData.additionalProperties); + Objects.equals(this.paginationMetadata, taskGraphLogsData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(taskGraphLogs, paginationMetadata, additionalProperties); + return Objects.hash(taskGraphLogs, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class TaskGraphLogsData {\n"); sb.append(" taskGraphLogs: ").append(toIndentedString(taskGraphLogs)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,25 +178,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphLogsData is not found in the empty JSON string", TaskGraphLogsData.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("task_graph_logs") != null && !jsonObj.get("task_graph_logs").isJsonNull()) { - JsonArray jsonArraytaskGraphLogs = jsonObj.getAsJsonArray("task_graph_logs"); - if (jsonArraytaskGraphLogs != null) { - // ensure the json data is an array - if (!jsonObj.get("task_graph_logs").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `task_graph_logs` to be an array in the JSON string but got `%s`", jsonObj.get("task_graph_logs").toString())); - } - - // validate the optional field `task_graph_logs` (array) - for (int i = 0; i < jsonArraytaskGraphLogs.size(); i++) { - TaskGraphLog.validateJsonElement(jsonArraytaskGraphLogs.get(i)); - }; - } - } - // validate the optional field `pagination_metadata` - if (jsonObj.get("pagination_metadata") != null && !jsonObj.get("pagination_metadata").isJsonNull()) { - PaginationMetadata.validateJsonElement(jsonObj.get("pagination_metadata")); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -260,28 +195,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphLogsData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +202,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphLogsData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphLogsData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNode.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNode.java index d4f8575..34b9d31 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNode.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNode.java @@ -57,7 +57,7 @@ /** * Information about a single node within a registered task graph. A single node represents one piece of data or a computational step; either as an input value, a data source, or a computation that acts upon earlier nodes. The structure parallels the existing `TaskGraphNodeMetadata`. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphNode { public static final String SERIALIZED_NAME_CLIENT_NODE_ID = "client_node_id"; @SerializedName(SERIALIZED_NAME_CLIENT_NODE_ID) @@ -299,50 +299,6 @@ public void setDeadline(Long deadline) { this.deadline = deadline; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphNode instance itself - */ - public TaskGraphNode putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -363,8 +319,7 @@ public boolean equals(Object o) { Objects.equals(this.udfNode, taskGraphNode.udfNode) && Objects.equals(this.retryStrategy, taskGraphNode.retryStrategy) && Objects.equals(this.expandNodeOutput, taskGraphNode.expandNodeOutput) && - Objects.equals(this.deadline, taskGraphNode.deadline)&& - Objects.equals(this.additionalProperties, taskGraphNode.additionalProperties); + Objects.equals(this.deadline, taskGraphNode.deadline); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -373,7 +328,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(clientNodeId, name, dependsOn, arrayNode, inputNode, sqlNode, udfNode, retryStrategy, expandNodeOutput, deadline, additionalProperties); + return Objects.hash(clientNodeId, name, dependsOn, arrayNode, inputNode, sqlNode, udfNode, retryStrategy, expandNodeOutput, deadline); } private static int hashCodeNullable(JsonNullable a) { @@ -397,7 +352,6 @@ public String toString() { sb.append(" retryStrategy: ").append(toIndentedString(retryStrategy)).append("\n"); sb.append(" expandNodeOutput: ").append(toIndentedString(expandNodeOutput)).append("\n"); sb.append(" deadline: ").append(toIndentedString(deadline)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -447,6 +401,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphNode is not found in the empty JSON string", TaskGraphNode.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TaskGraphNode.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TaskGraphNode` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("client_node_id") != null && !jsonObj.get("client_node_id").isJsonNull()) && !jsonObj.get("client_node_id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `client_node_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("client_node_id").toString())); @@ -498,28 +460,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphNode value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -527,28 +467,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphNode read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphNode instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNodeMetadata.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNodeMetadata.java index 8428869..d83311e 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNodeMetadata.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphNodeMetadata.java @@ -55,7 +55,7 @@ /** * Metadata about an individual node in a task graph. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphNodeMetadata { public static final String SERIALIZED_NAME_CLIENT_NODE_UUID = "client_node_uuid"; @SerializedName(SERIALIZED_NAME_CLIENT_NODE_UUID) @@ -227,50 +227,6 @@ public List getExecutions() { } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphNodeMetadata instance itself - */ - public TaskGraphNodeMetadata putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -288,8 +244,7 @@ public boolean equals(Object o) { Objects.equals(this.runLocation, taskGraphNodeMetadata.runLocation) && Objects.equals(this.status, taskGraphNodeMetadata.status) && Objects.equals(this.statusMessage, taskGraphNodeMetadata.statusMessage) && - Objects.equals(this.executions, taskGraphNodeMetadata.executions)&& - Objects.equals(this.additionalProperties, taskGraphNodeMetadata.additionalProperties); + Objects.equals(this.executions, taskGraphNodeMetadata.executions); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -298,7 +253,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(clientNodeUuid, name, dependsOn, runLocation, status, statusMessage, executions, additionalProperties); + return Objects.hash(clientNodeUuid, name, dependsOn, runLocation, status, statusMessage, executions); } private static int hashCodeNullable(JsonNullable a) { @@ -319,7 +274,6 @@ public String toString() { sb.append(" status: ").append(toIndentedString(status)).append("\n"); sb.append(" statusMessage: ").append(toIndentedString(statusMessage)).append("\n"); sb.append(" executions: ").append(toIndentedString(executions)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -366,42 +320,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphNodeMetadata is not found in the empty JSON string", TaskGraphNodeMetadata.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("client_node_uuid") != null && !jsonObj.get("client_node_uuid").isJsonNull()) && !jsonObj.get("client_node_uuid").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `client_node_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("client_node_uuid").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("depends_on") != null && !jsonObj.get("depends_on").isJsonNull() && !jsonObj.get("depends_on").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `depends_on` to be an array in the JSON string but got `%s`", jsonObj.get("depends_on").toString())); - } - // validate the optional field `run_location` - if (jsonObj.get("run_location") != null && !jsonObj.get("run_location").isJsonNull()) { - TaskGraphLogRunLocation.validateJsonElement(jsonObj.get("run_location")); - } - // validate the optional field `status` - if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) { - ArrayTaskStatus.validateJsonElement(jsonObj.get("status")); - } - if ((jsonObj.get("status_message") != null && !jsonObj.get("status_message").isJsonNull()) && !jsonObj.get("status_message").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `status_message` to be a primitive type in the JSON string but got `%s`", jsonObj.get("status_message").toString())); - } - if (jsonObj.get("executions") != null && !jsonObj.get("executions").isJsonNull()) { - JsonArray jsonArrayexecutions = jsonObj.getAsJsonArray("executions"); - if (jsonArrayexecutions != null) { - // ensure the json data is an array - if (!jsonObj.get("executions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `executions` to be an array in the JSON string but got `%s`", jsonObj.get("executions").toString())); - } - - // validate the optional field `executions` (array) - for (int i = 0; i < jsonArrayexecutions.size(); i++) { - ArrayTask.validateJsonElement(jsonArrayexecutions.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -419,28 +337,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphNodeMetadata value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -448,28 +344,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphNodeMetadata read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphNodeMetadata instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphSharing.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphSharing.java index feedb5f..d6f4640 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphSharing.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphSharing.java @@ -52,7 +52,7 @@ /** * details for sharing a given registered task graph */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphSharing { public static final String SERIALIZED_NAME_ACTIONS = "actions"; @SerializedName(SERIALIZED_NAME_ACTIONS) @@ -133,50 +133,6 @@ public void setNamespaceType(String namespaceType) { this.namespaceType = namespaceType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphSharing instance itself - */ - public TaskGraphSharing putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -190,13 +146,12 @@ public boolean equals(Object o) { TaskGraphSharing taskGraphSharing = (TaskGraphSharing) o; return Objects.equals(this.actions, taskGraphSharing.actions) && Objects.equals(this.namespace, taskGraphSharing.namespace) && - Objects.equals(this.namespaceType, taskGraphSharing.namespaceType)&& - Objects.equals(this.additionalProperties, taskGraphSharing.additionalProperties); + Objects.equals(this.namespaceType, taskGraphSharing.namespaceType); } @Override public int hashCode() { - return Objects.hash(actions, namespace, namespaceType, additionalProperties); + return Objects.hash(actions, namespace, namespaceType); } @Override @@ -206,7 +161,6 @@ public String toString() { sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" namespaceType: ").append(toIndentedString(namespaceType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -249,6 +203,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphSharing is not found in the empty JSON string", TaskGraphSharing.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TaskGraphSharing.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TaskGraphSharing` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // ensure the optional json data is an array if present if (jsonObj.get("actions") != null && !jsonObj.get("actions").isJsonNull() && !jsonObj.get("actions").isJsonArray()) { @@ -277,28 +239,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphSharing value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -306,28 +246,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphSharing read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphSharing instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphType.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphType.java index c1ad82d..413a391 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphType.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphType.java @@ -30,9 +30,9 @@ public enum TaskGraphType { BATCH("batch"), - + REALTIME("realtime"), - + NEXTFLOW("nextflow"); private String value; diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphs.java b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphs.java index bb434ab..7db1839 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphs.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TaskGraphs.java @@ -52,7 +52,7 @@ /** * Information about a series of task graphs. */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TaskGraphs { public static final String SERIALIZED_NAME_GRAPHS = "graphs"; @SerializedName(SERIALIZED_NAME_GRAPHS) @@ -87,50 +87,6 @@ public void setGraphs(List graphs) { this.graphs = graphs; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TaskGraphs instance itself - */ - public TaskGraphs putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } TaskGraphs taskGraphs = (TaskGraphs) o; - return Objects.equals(this.graphs, taskGraphs.graphs)&& - Objects.equals(this.additionalProperties, taskGraphs.additionalProperties); + return Objects.equals(this.graphs, taskGraphs.graphs); } @Override public int hashCode() { - return Objects.hash(graphs, additionalProperties); + return Objects.hash(graphs); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TaskGraphs {\n"); sb.append(" graphs: ").append(toIndentedString(graphs)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TaskGraphs is not found in the empty JSON string", TaskGraphs.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("graphs") != null && !jsonObj.get("graphs").isJsonNull()) { - JsonArray jsonArraygraphs = jsonObj.getAsJsonArray("graphs"); - if (jsonArraygraphs != null) { - // ensure the json data is an array - if (!jsonObj.get("graphs").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `graphs` to be an array in the JSON string but got `%s`", jsonObj.get("graphs").toString())); - } - - // validate the optional field `graphs` (array) - for (int i = 0; i < jsonArraygraphs.size(); i++) { - TaskGraph.validateJsonElement(jsonArraygraphs.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TaskGraphs value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public TaskGraphs read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TaskGraphs instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfig.java b/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfig.java index f3cc0f5..adc13fb 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfig.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfig.java @@ -52,7 +52,7 @@ /** * TileDB config used for interaction with the embedded library */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TileDBConfig { public static final String SERIALIZED_NAME_ENTRIES = "entries"; @SerializedName(SERIALIZED_NAME_ENTRIES) @@ -87,50 +87,6 @@ public void setEntries(List entries) { this.entries = entries; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TileDBConfig instance itself - */ - public TileDBConfig putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -142,13 +98,12 @@ public boolean equals(Object o) { return false; } TileDBConfig tileDBConfig = (TileDBConfig) o; - return Objects.equals(this.entries, tileDBConfig.entries)&& - Objects.equals(this.additionalProperties, tileDBConfig.additionalProperties); + return Objects.equals(this.entries, tileDBConfig.entries); } @Override public int hashCode() { - return Objects.hash(entries, additionalProperties); + return Objects.hash(entries); } @Override @@ -156,7 +111,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TileDBConfig {\n"); sb.append(" entries: ").append(toIndentedString(entries)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -197,21 +151,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TileDBConfig is not found in the empty JSON string", TileDBConfig.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if (jsonObj.get("entries") != null && !jsonObj.get("entries").isJsonNull()) { - JsonArray jsonArrayentries = jsonObj.getAsJsonArray("entries"); - if (jsonArrayentries != null) { - // ensure the json data is an array - if (!jsonObj.get("entries").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `entries` to be an array in the JSON string but got `%s`", jsonObj.get("entries").toString())); - } - - // validate the optional field `entries` (array) - for (int i = 0; i < jsonArrayentries.size(); i++) { - TileDBConfigEntriesInner.validateJsonElement(jsonArrayentries.get(i)); - }; - } - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -229,28 +168,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TileDBConfig value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -258,28 +175,7 @@ else if (entry.getValue() instanceof Character) public TileDBConfig read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TileDBConfig instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfigEntriesInner.java b/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfigEntriesInner.java index f9cf874..7fd5ef2 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfigEntriesInner.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TileDBConfigEntriesInner.java @@ -49,7 +49,7 @@ /** * TileDBConfigEntriesInner */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TileDBConfigEntriesInner { public static final String SERIALIZED_NAME_KEY = "key"; @SerializedName(SERIALIZED_NAME_KEY) @@ -99,50 +99,6 @@ public void setValue(String value) { this.value = value; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TileDBConfigEntriesInner instance itself - */ - public TileDBConfigEntriesInner putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -155,13 +111,12 @@ public boolean equals(Object o) { } TileDBConfigEntriesInner tileDBConfigEntriesInner = (TileDBConfigEntriesInner) o; return Objects.equals(this.key, tileDBConfigEntriesInner.key) && - Objects.equals(this.value, tileDBConfigEntriesInner.value)&& - Objects.equals(this.additionalProperties, tileDBConfigEntriesInner.additionalProperties); + Objects.equals(this.value, tileDBConfigEntriesInner.value); } @Override public int hashCode() { - return Objects.hash(key, value, additionalProperties); + return Objects.hash(key, value); } @Override @@ -170,7 +125,6 @@ public String toString() { sb.append("class TileDBConfigEntriesInner {\n"); sb.append(" key: ").append(toIndentedString(key)).append("\n"); sb.append(" value: ").append(toIndentedString(value)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -212,13 +166,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TileDBConfigEntriesInner is not found in the empty JSON string", TileDBConfigEntriesInner.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("key") != null && !jsonObj.get("key").isJsonNull()) && !jsonObj.get("key").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `key` to be a primitive type in the JSON string but got `%s`", jsonObj.get("key").toString())); - } - if ((jsonObj.get("value") != null && !jsonObj.get("value").isJsonNull()) && !jsonObj.get("value").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `value` to be a primitive type in the JSON string but got `%s`", jsonObj.get("value").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -236,28 +183,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TileDBConfigEntriesInner value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -265,28 +190,7 @@ else if (entry.getValue() instanceof Character) public TileDBConfigEntriesInner read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TileDBConfigEntriesInner instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Token.java b/src/main/java/io/tiledb/cloud/rest_api/model/Token.java index 422b0c8..08da614 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Token.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Token.java @@ -53,7 +53,7 @@ /** * A api token and its metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Token { public static final String SERIALIZED_NAME_TOKEN = "token"; @SerializedName(SERIALIZED_NAME_TOKEN) @@ -180,50 +180,6 @@ public void setScope(List scope) { this.scope = scope; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Token instance itself - */ - public Token putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -239,13 +195,12 @@ public boolean equals(Object o) { Objects.equals(this.name, token.name) && Objects.equals(this.issuedAt, token.issuedAt) && Objects.equals(this.expiresAt, token.expiresAt) && - Objects.equals(this.scope, token.scope)&& - Objects.equals(this.additionalProperties, token.additionalProperties); + Objects.equals(this.scope, token.scope); } @Override public int hashCode() { - return Objects.hash(token, name, issuedAt, expiresAt, scope, additionalProperties); + return Objects.hash(token, name, issuedAt, expiresAt, scope); } @Override @@ -257,7 +212,6 @@ public String toString() { sb.append(" issuedAt: ").append(toIndentedString(issuedAt)).append("\n"); sb.append(" expiresAt: ").append(toIndentedString(expiresAt)).append("\n"); sb.append(" scope: ").append(toIndentedString(scope)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -302,6 +256,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Token is not found in the empty JSON string", Token.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Token.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Token` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("token") != null && !jsonObj.get("token").isJsonNull()) && !jsonObj.get("token").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `token` to be a primitive type in the JSON string but got `%s`", jsonObj.get("token").toString())); @@ -330,28 +292,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Token value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -359,28 +299,7 @@ else if (entry.getValue() instanceof Character) public Token read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Token instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/TokenRequest.java b/src/main/java/io/tiledb/cloud/rest_api/model/TokenRequest.java index 8987400..78671c0 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/TokenRequest.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/TokenRequest.java @@ -53,7 +53,7 @@ /** * A request from a user for an api token */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class TokenRequest { public static final String SERIALIZED_NAME_EXPIRES = "expires"; @SerializedName(SERIALIZED_NAME_EXPIRES) @@ -134,50 +134,6 @@ public void setScope(List scope) { this.scope = scope; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the TokenRequest instance itself - */ - public TokenRequest putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -191,13 +147,12 @@ public boolean equals(Object o) { TokenRequest tokenRequest = (TokenRequest) o; return Objects.equals(this.expires, tokenRequest.expires) && Objects.equals(this.name, tokenRequest.name) && - Objects.equals(this.scope, tokenRequest.scope)&& - Objects.equals(this.additionalProperties, tokenRequest.additionalProperties); + Objects.equals(this.scope, tokenRequest.scope); } @Override public int hashCode() { - return Objects.hash(expires, name, scope, additionalProperties); + return Objects.hash(expires, name, scope); } @Override @@ -207,7 +162,6 @@ public String toString() { sb.append(" expires: ").append(toIndentedString(expires)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" scope: ").append(toIndentedString(scope)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -250,6 +204,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in TokenRequest is not found in the empty JSON string", TokenRequest.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!TokenRequest.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `TokenRequest` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); @@ -275,28 +237,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, TokenRequest value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -304,28 +244,7 @@ else if (entry.getValue() instanceof Character) public TokenRequest read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - TokenRequest instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFArrayDetails.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFArrayDetails.java index 6b910ac..216cb52 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFArrayDetails.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFArrayDetails.java @@ -53,7 +53,7 @@ /** * Contains array details for multi-array query including uri, ranges buffers */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFArrayDetails { public static final String SERIALIZED_NAME_PARAMETER_ID = "parameter_id"; @SerializedName(SERIALIZED_NAME_PARAMETER_ID) @@ -157,50 +157,6 @@ public void setBuffers(List buffers) { this.buffers = buffers; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFArrayDetails instance itself - */ - public UDFArrayDetails putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -215,8 +171,7 @@ public boolean equals(Object o) { return Objects.equals(this.parameterId, udFArrayDetails.parameterId) && Objects.equals(this.uri, udFArrayDetails.uri) && Objects.equals(this.ranges, udFArrayDetails.ranges) && - Objects.equals(this.buffers, udFArrayDetails.buffers)&& - Objects.equals(this.additionalProperties, udFArrayDetails.additionalProperties); + Objects.equals(this.buffers, udFArrayDetails.buffers); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -225,7 +180,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(parameterId, uri, ranges, buffers, additionalProperties); + return Objects.hash(parameterId, uri, ranges, buffers); } private static int hashCodeNullable(JsonNullable a) { @@ -243,7 +198,6 @@ public String toString() { sb.append(" uri: ").append(toIndentedString(uri)).append("\n"); sb.append(" ranges: ").append(toIndentedString(ranges)).append("\n"); sb.append(" buffers: ").append(toIndentedString(buffers)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -287,21 +241,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFArrayDetails is not found in the empty JSON string", UDFArrayDetails.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("parameter_id") != null && !jsonObj.get("parameter_id").isJsonNull()) && !jsonObj.get("parameter_id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `parameter_id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("parameter_id").toString())); - } - if ((jsonObj.get("uri") != null && !jsonObj.get("uri").isJsonNull()) && !jsonObj.get("uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("uri").toString())); - } - // validate the optional field `ranges` - if (jsonObj.get("ranges") != null && !jsonObj.get("ranges").isJsonNull()) { - QueryRanges.validateJsonElement(jsonObj.get("ranges")); - } - // ensure the optional json data is an array if present - if (jsonObj.get("buffers") != null && !jsonObj.get("buffers").isJsonNull() && !jsonObj.get("buffers").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `buffers` to be an array in the JSON string but got `%s`", jsonObj.get("buffers").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -319,28 +258,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFArrayDetails value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -348,28 +265,7 @@ else if (entry.getValue() instanceof Character) public UDFArrayDetails read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFArrayDetails instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopied.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopied.java index 7dd7b54..f114d8a 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopied.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopied.java @@ -49,7 +49,7 @@ /** * Copied udf uri and information */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFCopied { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -145,50 +145,6 @@ public void setId(String id) { this.id = id; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFCopied instance itself - */ - public UDFCopied putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -203,13 +159,12 @@ public boolean equals(Object o) { return Objects.equals(this.outputUri, udFCopied.outputUri) && Objects.equals(this.namespace, udFCopied.namespace) && Objects.equals(this.name, udFCopied.name) && - Objects.equals(this.id, udFCopied.id)&& - Objects.equals(this.additionalProperties, udFCopied.additionalProperties); + Objects.equals(this.id, udFCopied.id); } @Override public int hashCode() { - return Objects.hash(outputUri, namespace, name, id, additionalProperties); + return Objects.hash(outputUri, namespace, name, id); } @Override @@ -220,7 +175,6 @@ public String toString() { sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -266,6 +220,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti } } + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFCopied.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFCopied` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } + // check to make sure all required properties/fields are present in the JSON string for (String requiredField : UDFCopied.openapiRequiredFields) { if (jsonElement.getAsJsonObject().get(requiredField) == null) { @@ -302,28 +264,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFCopied value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -331,28 +271,7 @@ else if (entry.getValue() instanceof Character) public UDFCopied read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFCopied instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopy.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopy.java index b886a8e..0f52a05 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopy.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFCopy.java @@ -49,7 +49,7 @@ /** * information required to copy a udf */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFCopy { public static final String SERIALIZED_NAME_OUTPUT_URI = "output_uri"; @SerializedName(SERIALIZED_NAME_OUTPUT_URI) @@ -122,50 +122,6 @@ public void setName(String name) { this.name = name; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFCopy instance itself - */ - public UDFCopy putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { UDFCopy udFCopy = (UDFCopy) o; return Objects.equals(this.outputUri, udFCopy.outputUri) && Objects.equals(this.namespace, udFCopy.namespace) && - Objects.equals(this.name, udFCopy.name)&& - Objects.equals(this.additionalProperties, udFCopy.additionalProperties); + Objects.equals(this.name, udFCopy.name); } @Override public int hashCode() { - return Objects.hash(outputUri, namespace, name, additionalProperties); + return Objects.hash(outputUri, namespace, name); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" outputUri: ").append(toIndentedString(outputUri)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,16 +192,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFCopy is not found in the empty JSON string", UDFCopy.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("output_uri") != null && !jsonObj.get("output_uri").isJsonNull()) && !jsonObj.get("output_uri").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `output_uri` to be a primitive type in the JSON string but got `%s`", jsonObj.get("output_uri").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -265,28 +209,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFCopy value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +216,7 @@ else if (entry.getValue() instanceof Character) public UDFCopy read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFCopy instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavorite.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavorite.java index d2a7118..ed7f9b3 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavorite.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavorite.java @@ -49,7 +49,7 @@ /** * A user-favorite UDF item */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFFavorite { public static final String SERIALIZED_NAME_UDF_UUID = "udf_uuid"; @SerializedName(SERIALIZED_NAME_UDF_UUID) @@ -122,50 +122,6 @@ public void setName(String name) { this.name = name; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFFavorite instance itself - */ - public UDFFavorite putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -179,13 +135,12 @@ public boolean equals(Object o) { UDFFavorite udFFavorite = (UDFFavorite) o; return Objects.equals(this.udfUuid, udFFavorite.udfUuid) && Objects.equals(this.namespace, udFFavorite.namespace) && - Objects.equals(this.name, udFFavorite.name)&& - Objects.equals(this.additionalProperties, udFFavorite.additionalProperties); + Objects.equals(this.name, udFFavorite.name); } @Override public int hashCode() { - return Objects.hash(udfUuid, namespace, name, additionalProperties); + return Objects.hash(udfUuid, namespace, name); } @Override @@ -195,7 +150,6 @@ public String toString() { sb.append(" udfUuid: ").append(toIndentedString(udfUuid)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -238,6 +192,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFFavorite is not found in the empty JSON string", UDFFavorite.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFFavorite.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFFavorite` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("udf_uuid") != null && !jsonObj.get("udf_uuid").isJsonNull()) && !jsonObj.get("udf_uuid").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `udf_uuid` to be a primitive type in the JSON string but got `%s`", jsonObj.get("udf_uuid").toString())); @@ -265,28 +227,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFFavorite value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +234,7 @@ else if (entry.getValue() instanceof Character) public UDFFavorite read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFFavorite instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavoritesData.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavoritesData.java index 1173cf0..6b6ffe8 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavoritesData.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFFavoritesData.java @@ -53,7 +53,7 @@ /** * Object including UDF favorites and pagination metadata */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFFavoritesData { public static final String SERIALIZED_NAME_UDFS = "udfs"; @SerializedName(SERIALIZED_NAME_UDFS) @@ -111,50 +111,6 @@ public void setPaginationMetadata(PaginationMetadata paginationMetadata) { this.paginationMetadata = paginationMetadata; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFFavoritesData instance itself - */ - public UDFFavoritesData putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } UDFFavoritesData udFFavoritesData = (UDFFavoritesData) o; return Objects.equals(this.udfs, udFFavoritesData.udfs) && - Objects.equals(this.paginationMetadata, udFFavoritesData.paginationMetadata)&& - Objects.equals(this.additionalProperties, udFFavoritesData.additionalProperties); + Objects.equals(this.paginationMetadata, udFFavoritesData.paginationMetadata); } @Override public int hashCode() { - return Objects.hash(udfs, paginationMetadata, additionalProperties); + return Objects.hash(udfs, paginationMetadata); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class UDFFavoritesData {\n"); sb.append(" udfs: ").append(toIndentedString(udfs)).append("\n"); sb.append(" paginationMetadata: ").append(toIndentedString(paginationMetadata)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFFavoritesData is not found in the empty JSON string", UDFFavoritesData.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFFavoritesData.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFFavoritesData` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if (jsonObj.get("udfs") != null && !jsonObj.get("udfs").isJsonNull()) { JsonArray jsonArrayudfs = jsonObj.getAsJsonArray("udfs"); @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFFavoritesData value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public UDFFavoritesData read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFFavoritesData instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFImage.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFImage.java index 48f3d39..a90900d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFImage.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFImage.java @@ -50,7 +50,7 @@ /** * Defines a set of images related to a specific name */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFImage { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -123,50 +123,6 @@ public void setLanguage(UDFLanguage language) { this.language = language; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFImage instance itself - */ - public UDFImage putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -180,13 +136,12 @@ public boolean equals(Object o) { UDFImage udFImage = (UDFImage) o; return Objects.equals(this.id, udFImage.id) && Objects.equals(this.name, udFImage.name) && - Objects.equals(this.language, udFImage.language)&& - Objects.equals(this.additionalProperties, udFImage.additionalProperties); + Objects.equals(this.language, udFImage.language); } @Override public int hashCode() { - return Objects.hash(id, name, language, additionalProperties); + return Objects.hash(id, name, language); } @Override @@ -196,7 +151,6 @@ public String toString() { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" language: ").append(toIndentedString(language)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -239,6 +193,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFImage is not found in the empty JSON string", UDFImage.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFImage.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFImage` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); @@ -267,28 +229,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFImage value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -296,28 +236,7 @@ else if (entry.getValue() instanceof Character) public UDFImage read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFImage instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFImageVersion.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFImageVersion.java index ca9f878..4b8e5f0 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFImageVersion.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFImageVersion.java @@ -50,7 +50,7 @@ /** * Defines an image that belongs to a set of images having a version */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFImageVersion { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -215,50 +215,6 @@ public void setLatest(Boolean latest) { this.latest = latest; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFImageVersion instance itself - */ - public UDFImageVersion putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -276,13 +232,12 @@ public boolean equals(Object o) { Objects.equals(this.dockerImage, udFImageVersion.dockerImage) && Objects.equals(this.version, udFImageVersion.version) && Objects.equals(this._default, udFImageVersion._default) && - Objects.equals(this.latest, udFImageVersion.latest)&& - Objects.equals(this.additionalProperties, udFImageVersion.additionalProperties); + Objects.equals(this.latest, udFImageVersion.latest); } @Override public int hashCode() { - return Objects.hash(id, name, udfImageUuid, dockerImage, version, _default, latest, additionalProperties); + return Objects.hash(id, name, udfImageUuid, dockerImage, version, _default, latest); } @Override @@ -296,7 +251,6 @@ public String toString() { sb.append(" version: ").append(toIndentedString(version)).append("\n"); sb.append(" _default: ").append(toIndentedString(_default)).append("\n"); sb.append(" latest: ").append(toIndentedString(latest)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -343,6 +297,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFImageVersion is not found in the empty JSON string", UDFImageVersion.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFImageVersion.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFImageVersion` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); @@ -373,28 +335,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFImageVersion value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -402,28 +342,7 @@ else if (entry.getValue() instanceof Character) public UDFImageVersion read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFImageVersion instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfo.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfo.java index 8879166..d53725a 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfo.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfo.java @@ -53,7 +53,7 @@ /** * User-defined function that can persist in db, used and shared multiple times */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFInfo { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -249,50 +249,6 @@ public void setTags(List tags) { this.tags = tags; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFInfo instance itself - */ - public UDFInfo putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -311,13 +267,12 @@ public boolean equals(Object o) { Objects.equals(this.readme, udFInfo.readme) && Objects.equals(this.licenseId, udFInfo.licenseId) && Objects.equals(this.licenseText, udFInfo.licenseText) && - Objects.equals(this.tags, udFInfo.tags)&& - Objects.equals(this.additionalProperties, udFInfo.additionalProperties); + Objects.equals(this.tags, udFInfo.tags); } @Override public int hashCode() { - return Objects.hash(id, name, language, type, readme, licenseId, licenseText, tags, additionalProperties); + return Objects.hash(id, name, language, type, readme, licenseId, licenseText, tags); } @Override @@ -332,7 +287,6 @@ public String toString() { sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n"); sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -380,6 +334,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFInfo is not found in the empty JSON string", UDFInfo.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFInfo.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFInfo` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); @@ -425,28 +387,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFInfo value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -454,28 +394,7 @@ else if (entry.getValue() instanceof Character) public UDFInfo read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFInfo instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfoUpdate.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfoUpdate.java index 65c7b13..7ee6587 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfoUpdate.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFInfoUpdate.java @@ -53,7 +53,7 @@ /** * User-defined function that can persist in db, used and shared multiple times */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFInfoUpdate { public static final String SERIALIZED_NAME_NAME = "name"; @SerializedName(SERIALIZED_NAME_NAME) @@ -318,50 +318,6 @@ public void setTags(List tags) { this.tags = tags; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFInfoUpdate instance itself - */ - public UDFInfoUpdate putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -383,13 +339,12 @@ public boolean equals(Object o) { Objects.equals(this.readme, udFInfoUpdate.readme) && Objects.equals(this.licenseId, udFInfoUpdate.licenseId) && Objects.equals(this.licenseText, udFInfoUpdate.licenseText) && - Objects.equals(this.tags, udFInfoUpdate.tags)&& - Objects.equals(this.additionalProperties, udFInfoUpdate.additionalProperties); + Objects.equals(this.tags, udFInfoUpdate.tags); } @Override public int hashCode() { - return Objects.hash(name, language, version, imageName, type, exec, execRaw, readme, licenseId, licenseText, tags, additionalProperties); + return Objects.hash(name, language, version, imageName, type, exec, execRaw, readme, licenseId, licenseText, tags); } @Override @@ -407,7 +362,6 @@ public String toString() { sb.append(" licenseId: ").append(toIndentedString(licenseId)).append("\n"); sb.append(" licenseText: ").append(toIndentedString(licenseText)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -458,6 +412,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFInfoUpdate is not found in the empty JSON string", UDFInfoUpdate.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFInfoUpdate.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFInfoUpdate` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); @@ -512,28 +474,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFInfoUpdate value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -541,28 +481,7 @@ else if (entry.getValue() instanceof Character) public UDFInfoUpdate read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFInfoUpdate instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFSharing.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFSharing.java index f0f19d3..6a0144c 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFSharing.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFSharing.java @@ -52,7 +52,7 @@ /** * details for sharing a given UDF */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFSharing { public static final String SERIALIZED_NAME_ACTIONS = "actions"; @SerializedName(SERIALIZED_NAME_ACTIONS) @@ -133,50 +133,6 @@ public void setNamespaceType(String namespaceType) { this.namespaceType = namespaceType; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFSharing instance itself - */ - public UDFSharing putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -190,13 +146,12 @@ public boolean equals(Object o) { UDFSharing udFSharing = (UDFSharing) o; return Objects.equals(this.actions, udFSharing.actions) && Objects.equals(this.namespace, udFSharing.namespace) && - Objects.equals(this.namespaceType, udFSharing.namespaceType)&& - Objects.equals(this.additionalProperties, udFSharing.additionalProperties); + Objects.equals(this.namespaceType, udFSharing.namespaceType); } @Override public int hashCode() { - return Objects.hash(actions, namespace, namespaceType, additionalProperties); + return Objects.hash(actions, namespace, namespaceType); } @Override @@ -206,7 +161,6 @@ public String toString() { sb.append(" actions: ").append(toIndentedString(actions)).append("\n"); sb.append(" namespace: ").append(toIndentedString(namespace)).append("\n"); sb.append(" namespaceType: ").append(toIndentedString(namespaceType)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -249,17 +203,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFSharing is not found in the empty JSON string", UDFSharing.openapiRequiredFields.toString())); } } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // ensure the optional json data is an array if present - if (jsonObj.get("actions") != null && !jsonObj.get("actions").isJsonNull() && !jsonObj.get("actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `actions` to be an array in the JSON string but got `%s`", jsonObj.get("actions").toString())); - } - if ((jsonObj.get("namespace") != null && !jsonObj.get("namespace").isJsonNull()) && !jsonObj.get("namespace").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace").toString())); - } - if ((jsonObj.get("namespace_type") != null && !jsonObj.get("namespace_type").isJsonNull()) && !jsonObj.get("namespace_type").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `namespace_type` to be a primitive type in the JSON string but got `%s`", jsonObj.get("namespace_type").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -277,28 +220,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFSharing value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -306,28 +227,7 @@ else if (entry.getValue() instanceof Character) public UDFSharing read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFSharing instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarray.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarray.java index 84a91b6..a2e9c8d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarray.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarray.java @@ -53,7 +53,7 @@ /** * Subarray bounds to query for a UDF to operate on */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFSubarray { public static final String SERIALIZED_NAME_LAYOUT = "layout"; @SerializedName(SERIALIZED_NAME_LAYOUT) @@ -111,50 +111,6 @@ public void setRanges(List ranges) { this.ranges = ranges; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFSubarray instance itself - */ - public UDFSubarray putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -167,13 +123,12 @@ public boolean equals(Object o) { } UDFSubarray udFSubarray = (UDFSubarray) o; return Objects.equals(this.layout, udFSubarray.layout) && - Objects.equals(this.ranges, udFSubarray.ranges)&& - Objects.equals(this.additionalProperties, udFSubarray.additionalProperties); + Objects.equals(this.ranges, udFSubarray.ranges); } @Override public int hashCode() { - return Objects.hash(layout, ranges, additionalProperties); + return Objects.hash(layout, ranges); } @Override @@ -182,7 +137,6 @@ public String toString() { sb.append("class UDFSubarray {\n"); sb.append(" layout: ").append(toIndentedString(layout)).append("\n"); sb.append(" ranges: ").append(toIndentedString(ranges)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -224,6 +178,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFSubarray is not found in the empty JSON string", UDFSubarray.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFSubarray.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFSubarray` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `layout` if (jsonObj.get("layout") != null && !jsonObj.get("layout").isJsonNull()) { @@ -260,28 +222,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFSubarray value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -289,28 +229,7 @@ else if (entry.getValue() instanceof Character) public UDFSubarray read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFSubarray instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarrayRange.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarrayRange.java index 18f73ac..be1ad4d 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarrayRange.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFSubarrayRange.java @@ -50,7 +50,7 @@ /** * A dimension range to query */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class UDFSubarrayRange { public static final String SERIALIZED_NAME_DIMENSION_ID = "dimension_id"; @SerializedName(SERIALIZED_NAME_DIMENSION_ID) @@ -123,50 +123,6 @@ public void setRangeEnd(DimensionCoordinate rangeEnd) { this.rangeEnd = rangeEnd; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the UDFSubarrayRange instance itself - */ - public UDFSubarrayRange putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -180,13 +136,12 @@ public boolean equals(Object o) { UDFSubarrayRange udFSubarrayRange = (UDFSubarrayRange) o; return Objects.equals(this.dimensionId, udFSubarrayRange.dimensionId) && Objects.equals(this.rangeStart, udFSubarrayRange.rangeStart) && - Objects.equals(this.rangeEnd, udFSubarrayRange.rangeEnd)&& - Objects.equals(this.additionalProperties, udFSubarrayRange.additionalProperties); + Objects.equals(this.rangeEnd, udFSubarrayRange.rangeEnd); } @Override public int hashCode() { - return Objects.hash(dimensionId, rangeStart, rangeEnd, additionalProperties); + return Objects.hash(dimensionId, rangeStart, rangeEnd); } @Override @@ -196,7 +151,6 @@ public String toString() { sb.append(" dimensionId: ").append(toIndentedString(dimensionId)).append("\n"); sb.append(" rangeStart: ").append(toIndentedString(rangeStart)).append("\n"); sb.append(" rangeEnd: ").append(toIndentedString(rangeEnd)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -239,6 +193,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in UDFSubarrayRange is not found in the empty JSON string", UDFSubarrayRange.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!UDFSubarrayRange.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `UDFSubarrayRange` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `range_start` if (jsonObj.get("range_start") != null && !jsonObj.get("range_start").isJsonNull()) { @@ -265,28 +227,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, UDFSubarrayRange value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -294,28 +234,7 @@ else if (entry.getValue() instanceof Character) public UDFSubarrayRange read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - UDFSubarrayRange instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/UDFType.java b/src/main/java/io/tiledb/cloud/rest_api/model/UDFType.java index 3d30f63..5554783 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/UDFType.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/UDFType.java @@ -33,9 +33,7 @@ public enum UDFType { SINGLE_ARRAY("single_array"), - GENERIC("generic"), - - BASH("bash"); + GENERIC("generic"); private String value; diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/User.java b/src/main/java/io/tiledb/cloud/rest_api/model/User.java index ab46e80..a1e6893 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/User.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/User.java @@ -55,7 +55,7 @@ /** * User */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class User { public static final String SERIALIZED_NAME_ID = "id"; @SerializedName(SERIALIZED_NAME_ID) @@ -479,50 +479,6 @@ public void setDefaultRegion(String defaultRegion) { this.defaultRegion = defaultRegion; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the User instance itself - */ - public User putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -552,8 +508,7 @@ public boolean equals(Object o) { Objects.equals(this.defaultS3PathCredentialsName, user.defaultS3PathCredentialsName) && Objects.equals(this.assetLocations, user.assetLocations) && Objects.equals(this.defaultNamespaceCharged, user.defaultNamespaceCharged) && - Objects.equals(this.defaultRegion, user.defaultRegion)&& - Objects.equals(this.additionalProperties, user.additionalProperties); + Objects.equals(this.defaultRegion, user.defaultRegion); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -562,7 +517,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, username, password, name, email, isValidEmail, stripeConnect, company, logo, timezone, organizations, allowedActions, enabledFeatures, unpaidSubscription, defaultS3Path, defaultS3PathCredentialsName, assetLocations, defaultNamespaceCharged, defaultRegion, additionalProperties); + return Objects.hash(id, username, password, name, email, isValidEmail, stripeConnect, company, logo, timezone, organizations, allowedActions, enabledFeatures, unpaidSubscription, defaultS3Path, defaultS3PathCredentialsName, assetLocations, defaultNamespaceCharged, defaultRegion); } private static int hashCodeNullable(JsonNullable a) { @@ -595,7 +550,6 @@ public String toString() { sb.append(" assetLocations: ").append(toIndentedString(assetLocations)).append("\n"); sb.append(" defaultNamespaceCharged: ").append(toIndentedString(defaultNamespaceCharged)).append("\n"); sb.append(" defaultRegion: ").append(toIndentedString(defaultRegion)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -655,73 +609,6 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in User is not found in the empty JSON string", User.openapiRequiredFields.toString())); } } - - // check to make sure all required properties/fields are present in the JSON string - for (String requiredField : User.openapiRequiredFields) { - if (jsonElement.getAsJsonObject().get(requiredField) == null) { - throw new IllegalArgumentException(String.format("The required field `%s` is not found in the JSON string: %s", requiredField, jsonElement.toString())); - } - } - JsonObject jsonObj = jsonElement.getAsJsonObject(); - if ((jsonObj.get("id") != null && !jsonObj.get("id").isJsonNull()) && !jsonObj.get("id").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `id` to be a primitive type in the JSON string but got `%s`", jsonObj.get("id").toString())); - } - if (!jsonObj.get("username").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `username` to be a primitive type in the JSON string but got `%s`", jsonObj.get("username").toString())); - } - if ((jsonObj.get("password") != null && !jsonObj.get("password").isJsonNull()) && !jsonObj.get("password").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `password` to be a primitive type in the JSON string but got `%s`", jsonObj.get("password").toString())); - } - if ((jsonObj.get("name") != null && !jsonObj.get("name").isJsonNull()) && !jsonObj.get("name").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `name` to be a primitive type in the JSON string but got `%s`", jsonObj.get("name").toString())); - } - if ((jsonObj.get("email") != null && !jsonObj.get("email").isJsonNull()) && !jsonObj.get("email").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `email` to be a primitive type in the JSON string but got `%s`", jsonObj.get("email").toString())); - } - if ((jsonObj.get("company") != null && !jsonObj.get("company").isJsonNull()) && !jsonObj.get("company").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `company` to be a primitive type in the JSON string but got `%s`", jsonObj.get("company").toString())); - } - if ((jsonObj.get("logo") != null && !jsonObj.get("logo").isJsonNull()) && !jsonObj.get("logo").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `logo` to be a primitive type in the JSON string but got `%s`", jsonObj.get("logo").toString())); - } - if ((jsonObj.get("timezone") != null && !jsonObj.get("timezone").isJsonNull()) && !jsonObj.get("timezone").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `timezone` to be a primitive type in the JSON string but got `%s`", jsonObj.get("timezone").toString())); - } - if (jsonObj.get("organizations") != null && !jsonObj.get("organizations").isJsonNull()) { - JsonArray jsonArrayorganizations = jsonObj.getAsJsonArray("organizations"); - if (jsonArrayorganizations != null) { - // ensure the json data is an array - if (!jsonObj.get("organizations").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `organizations` to be an array in the JSON string but got `%s`", jsonObj.get("organizations").toString())); - } - - // validate the optional field `organizations` (array) - for (int i = 0; i < jsonArrayorganizations.size(); i++) { - OrganizationUser.validateJsonElement(jsonArrayorganizations.get(i)); - }; - } - } - // ensure the optional json data is an array if present - if (jsonObj.get("allowed_actions") != null && !jsonObj.get("allowed_actions").isJsonNull() && !jsonObj.get("allowed_actions").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `allowed_actions` to be an array in the JSON string but got `%s`", jsonObj.get("allowed_actions").toString())); - } - // ensure the optional json data is an array if present - if (jsonObj.get("enabled_features") != null && !jsonObj.get("enabled_features").isJsonNull() && !jsonObj.get("enabled_features").isJsonArray()) { - throw new IllegalArgumentException(String.format("Expected the field `enabled_features` to be an array in the JSON string but got `%s`", jsonObj.get("enabled_features").toString())); - } - if ((jsonObj.get("default_s3_path") != null && !jsonObj.get("default_s3_path").isJsonNull()) && !jsonObj.get("default_s3_path").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `default_s3_path` to be a primitive type in the JSON string but got `%s`", jsonObj.get("default_s3_path").toString())); - } - // validate the optional field `asset_locations` - if (jsonObj.get("asset_locations") != null && !jsonObj.get("asset_locations").isJsonNull()) { - AssetLocations.validateJsonElement(jsonObj.get("asset_locations")); - } - if ((jsonObj.get("default_namespace_charged") != null && !jsonObj.get("default_namespace_charged").isJsonNull()) && !jsonObj.get("default_namespace_charged").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `default_namespace_charged` to be a primitive type in the JSON string but got `%s`", jsonObj.get("default_namespace_charged").toString())); - } - if ((jsonObj.get("default_region") != null && !jsonObj.get("default_region").isJsonNull()) && !jsonObj.get("default_region").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `default_region` to be a primitive type in the JSON string but got `%s`", jsonObj.get("default_region").toString())); - } } public static class CustomTypeAdapterFactory implements TypeAdapterFactory { @@ -739,28 +626,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, User value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -768,28 +633,7 @@ else if (entry.getValue() instanceof Character) public User read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - User instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/main/java/io/tiledb/cloud/rest_api/model/Writer.java b/src/main/java/io/tiledb/cloud/rest_api/model/Writer.java index 3c758a4..86fc3d6 100644 --- a/src/main/java/io/tiledb/cloud/rest_api/model/Writer.java +++ b/src/main/java/io/tiledb/cloud/rest_api/model/Writer.java @@ -50,7 +50,7 @@ /** * Writer */ -@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", date = "2024-09-13T19:24:49.771847040-04:00[America/New_York]", comments = "Generator version: 7.7.0") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.7.0") public class Writer { public static final String SERIALIZED_NAME_CHECK_COORD_DUPS = "checkCoordDups"; @SerializedName(SERIALIZED_NAME_CHECK_COORD_DUPS) @@ -146,50 +146,6 @@ public void setSubarray(DomainArray subarray) { this.subarray = subarray; } - /** - * A container for additional, undeclared properties. - * This is a holder for any undeclared properties as specified with - * the 'additionalProperties' keyword in the OAS document. - */ - private Map additionalProperties; - - /** - * Set the additional (undeclared) property with the specified name and value. - * If the property does not already exist, create it otherwise replace it. - * - * @param key name of the property - * @param value value of the property - * @return the Writer instance itself - */ - public Writer putAdditionalProperty(String key, Object value) { - if (this.additionalProperties == null) { - this.additionalProperties = new HashMap(); - } - this.additionalProperties.put(key, value); - return this; - } - - /** - * Return the additional (undeclared) property. - * - * @return a map of objects - */ - public Map getAdditionalProperties() { - return additionalProperties; - } - - /** - * Return the additional (undeclared) property with the specified name. - * - * @param key name of the property - * @return an object - */ - public Object getAdditionalProperty(String key) { - if (this.additionalProperties == null) { - return null; - } - return this.additionalProperties.get(key); - } @Override @@ -204,13 +160,12 @@ public boolean equals(Object o) { return Objects.equals(this.checkCoordDups, writer.checkCoordDups) && Objects.equals(this.checkCoordOOB, writer.checkCoordOOB) && Objects.equals(this.dedupCoords, writer.dedupCoords) && - Objects.equals(this.subarray, writer.subarray)&& - Objects.equals(this.additionalProperties, writer.additionalProperties); + Objects.equals(this.subarray, writer.subarray); } @Override public int hashCode() { - return Objects.hash(checkCoordDups, checkCoordOOB, dedupCoords, subarray, additionalProperties); + return Objects.hash(checkCoordDups, checkCoordOOB, dedupCoords, subarray); } @Override @@ -221,7 +176,6 @@ public String toString() { sb.append(" checkCoordOOB: ").append(toIndentedString(checkCoordOOB)).append("\n"); sb.append(" dedupCoords: ").append(toIndentedString(dedupCoords)).append("\n"); sb.append(" subarray: ").append(toIndentedString(subarray)).append("\n"); - sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); } @@ -265,6 +219,14 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti throw new IllegalArgumentException(String.format("The required field(s) %s in Writer is not found in the empty JSON string", Writer.openapiRequiredFields.toString())); } } + + Set> entries = jsonElement.getAsJsonObject().entrySet(); + // check to see if the JSON string contains additional fields + for (Map.Entry entry : entries) { + if (!Writer.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `Writer` properties. JSON: %s", entry.getKey(), jsonElement.toString())); + } + } JsonObject jsonObj = jsonElement.getAsJsonObject(); // validate the optional field `subarray` if (jsonObj.get("subarray") != null && !jsonObj.get("subarray").isJsonNull()) { @@ -287,28 +249,6 @@ public TypeAdapter create(Gson gson, TypeToken type) { @Override public void write(JsonWriter out, Writer value) throws IOException { JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); - obj.remove("additionalProperties"); - // serialize additional properties - if (value.getAdditionalProperties() != null) { - for (Map.Entry entry : value.getAdditionalProperties().entrySet()) { - if (entry.getValue() instanceof String) - obj.addProperty(entry.getKey(), (String) entry.getValue()); - else if (entry.getValue() instanceof Number) - obj.addProperty(entry.getKey(), (Number) entry.getValue()); - else if (entry.getValue() instanceof Boolean) - obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); - else if (entry.getValue() instanceof Character) - obj.addProperty(entry.getKey(), (Character) entry.getValue()); - else { - JsonElement jsonElement = gson.toJsonTree(entry.getValue()); - if (jsonElement.isJsonArray()) { - obj.add(entry.getKey(), jsonElement.getAsJsonArray()); - } else { - obj.add(entry.getKey(), jsonElement.getAsJsonObject()); - } - } - } - } elementAdapter.write(out, obj); } @@ -316,28 +256,7 @@ else if (entry.getValue() instanceof Character) public Writer read(JsonReader in) throws IOException { JsonElement jsonElement = elementAdapter.read(in); validateJsonElement(jsonElement); - JsonObject jsonObj = jsonElement.getAsJsonObject(); - // store additional fields in the deserialized instance - Writer instance = thisAdapter.fromJsonTree(jsonObj); - for (Map.Entry entry : jsonObj.entrySet()) { - if (!openapiFields.contains(entry.getKey())) { - if (entry.getValue().isJsonPrimitive()) { // primitive type - if (entry.getValue().getAsJsonPrimitive().isString()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); - else if (entry.getValue().getAsJsonPrimitive().isNumber()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); - else if (entry.getValue().getAsJsonPrimitive().isBoolean()) - instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); - else - throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); - } else if (entry.getValue().isJsonArray()) { - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), List.class)); - } else { // JSON object - instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); - } - } - } - return instance; + return thisAdapter.fromJsonTree(jsonElement); } }.nullSafe(); diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/ArrayApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/ArrayApiTest.java index 2b0ff77..e789dc0 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/ArrayApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/ArrayApiTest.java @@ -60,14 +60,15 @@ public class ArrayApiTest { */ @Test public void arrayActivityLogTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; Integer start = null; Integer end = null; String eventTypes = null; String taskId = null; Boolean hasTaskId = null; - List response = api.arrayActivityLog(namespace, array, start, end, eventTypes, taskId, hasTaskId); + List response = api.arrayActivityLog(workspace, teamspace, array, start, end, eventTypes, taskId, hasTaskId); // TODO: test validations } @@ -190,12 +191,13 @@ public void arraysBrowserSharedSidebarGetTest() throws ApiException { * @throws ApiException if the Api call fails */ @Test - public void arraysNamespaceArrayEndTimestampsGetTest() throws ApiException { - String namespace = null; + public void arraysWorkspaceTeamspaceArrayEndTimestampsGetTest() throws ApiException { + String workspace = null; + String teamspace = null; String array = null; Integer page = null; Integer perPage = null; - ArrayEndTimestampData response = api.arraysNamespaceArrayEndTimestampsGet(namespace, array, page, perPage); + ArrayEndTimestampData response = api.arraysWorkspaceTeamspaceArrayEndTimestampsGet(workspace, teamspace, array, page, perPage); // TODO: test validations } @@ -206,10 +208,11 @@ public void arraysNamespaceArrayEndTimestampsGetTest() throws ApiException { */ @Test public void consolidateArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArrayConsolidationRequest consolidateRequest = null; - api.consolidateArray(namespace, array, consolidateRequest); + api.consolidateArray(workspace, teamspace, array, consolidateRequest); // TODO: test validations } @@ -220,12 +223,13 @@ public void consolidateArrayTest() throws ApiException { */ @Test public void createArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; ArraySchema arraySchema = null; String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = null; - api.createArray(namespace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); + api.createArray(workspace, teamspace, array, contentType, arraySchema, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); // TODO: test validations } @@ -236,10 +240,11 @@ public void createArrayTest() throws ApiException { */ @Test public void deleteArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; - api.deleteArray(namespace, array, contentType); + api.deleteArray(workspace, teamspace, array, contentType); // TODO: test validations } @@ -250,9 +255,10 @@ public void deleteArrayTest() throws ApiException { */ @Test public void deregisterArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; - api.deregisterArray(namespace, array); + api.deregisterArray(workspace, teamspace, array); // TODO: test validations } @@ -263,11 +269,12 @@ public void deregisterArrayTest() throws ApiException { */ @Test public void fragmentInfoTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; FragmentInfoRequest fragmentInfoRequest = null; - FragmentInfo response = api.fragmentInfo(namespace, array, contentType, fragmentInfoRequest); + FragmentInfo response = api.fragmentInfo(workspace, teamspace, array, contentType, fragmentInfoRequest); // TODO: test validations } @@ -278,10 +285,11 @@ public void fragmentInfoTest() throws ApiException { */ @Test public void getActivityLogByIdTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String id = null; - ArrayActivityLog response = api.getActivityLogById(namespace, array, id); + ArrayActivityLog response = api.getActivityLogById(workspace, teamspace, array, id); // TODO: test validations } @@ -304,10 +312,11 @@ public void getAllArrayMetadataTest() throws ApiException { */ @Test public void getArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; - ArraySchema response = api.getArray(namespace, array, contentType); + ArraySchema response = api.getArray(workspace, teamspace, array, contentType); // TODO: test validations } @@ -318,12 +327,13 @@ public void getArrayTest() throws ApiException { */ @Test public void getArrayMaxBufferSizesTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String subarray = null; String contentType = null; String xPayer = null; - MaxBufferSizes response = api.getArrayMaxBufferSizes(namespace, array, subarray, contentType, xPayer); + MaxBufferSizes response = api.getArrayMaxBufferSizes(workspace, teamspace, array, subarray, contentType, xPayer); // TODO: test validations } @@ -334,11 +344,12 @@ public void getArrayMaxBufferSizesTest() throws ApiException { */ @Test public void getArrayMetaDataJsonTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; Integer length = null; Integer endTimestamp = null; - Map response = api.getArrayMetaDataJson(namespace, array, length, endTimestamp); + Map response = api.getArrayMetaDataJson(workspace, teamspace, array, length, endTimestamp); // TODO: test validations } @@ -349,9 +360,10 @@ public void getArrayMetaDataJsonTest() throws ApiException { */ @Test public void getArrayMetadataTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; - ArrayInfo response = api.getArrayMetadata(namespace, array); + ArrayInfo response = api.getArrayMetadata(workspace, teamspace, array); // TODO: test validations } @@ -362,9 +374,10 @@ public void getArrayMetadataTest() throws ApiException { */ @Test public void getArrayMetadataCapnpTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; - ArrayMetadata response = api.getArrayMetadataCapnp(namespace, array); + ArrayMetadata response = api.getArrayMetadataCapnp(workspace, teamspace, array); // TODO: test validations } @@ -375,11 +388,12 @@ public void getArrayMetadataCapnpTest() throws ApiException { */ @Test public void getArrayNonEmptyDomainTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; String xPayer = null; - NonEmptyDomain response = api.getArrayNonEmptyDomain(namespace, array, contentType, xPayer); + NonEmptyDomain response = api.getArrayNonEmptyDomain(workspace, teamspace, array, contentType, xPayer); // TODO: test validations } @@ -390,9 +404,10 @@ public void getArrayNonEmptyDomainTest() throws ApiException { */ @Test public void getArrayNonEmptyDomainJsonTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; - Map response = api.getArrayNonEmptyDomainJson(namespace, array); + Map response = api.getArrayNonEmptyDomainJson(workspace, teamspace, array); // TODO: test validations } @@ -403,10 +418,11 @@ public void getArrayNonEmptyDomainJsonTest() throws ApiException { */ @Test public void getArraySampleDataTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; BigDecimal samples = null; - ArraySample response = api.getArraySampleData(namespace, array, samples); + ArraySample response = api.getArraySampleData(workspace, teamspace, array, samples); // TODO: test validations } @@ -417,9 +433,10 @@ public void getArraySampleDataTest() throws ApiException { */ @Test public void getArraySharingPoliciesTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; - List response = api.getArraySharingPolicies(namespace, array); + List response = api.getArraySharingPolicies(workspace, teamspace, array); // TODO: test validations } @@ -430,9 +447,10 @@ public void getArraySharingPoliciesTest() throws ApiException { */ @Test public void getArraysInNamespaceTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; Boolean withMetadata = null; - List response = api.getArraysInNamespace(namespace, withMetadata); + List response = api.getArraysInNamespace(workspace, teamspace, withMetadata); // TODO: test validations } @@ -443,10 +461,11 @@ public void getArraysInNamespaceTest() throws ApiException { */ @Test public void getFragmentEndTimestampTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; Integer endTimestamp = null; - Integer response = api.getFragmentEndTimestamp(namespace, array, endTimestamp); + Integer response = api.getFragmentEndTimestamp(workspace, teamspace, array, endTimestamp); // TODO: test validations } @@ -466,10 +485,11 @@ public void getLastAccessedArraysTest() throws ApiException { */ @Test public void loadArraySchemaTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; LoadArraySchemaRequest loadArraySchemaRequest = null; - LoadArraySchemaResponse response = api.loadArraySchema(namespace, array, loadArraySchemaRequest); + LoadArraySchemaResponse response = api.loadArraySchema(workspace, teamspace, array, loadArraySchemaRequest); // TODO: test validations } @@ -480,10 +500,11 @@ public void loadArraySchemaTest() throws ApiException { */ @Test public void loadEnumerationsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; LoadEnumerationsRequest loadEnumerationsRequest = null; - LoadEnumerationsResponse response = api.loadEnumerations(namespace, array, loadEnumerationsRequest); + LoadEnumerationsResponse response = api.loadEnumerations(workspace, teamspace, array, loadEnumerationsRequest); // TODO: test validations } @@ -494,10 +515,11 @@ public void loadEnumerationsTest() throws ApiException { */ @Test public void registerArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArrayInfoUpdate arrayMetadata = null; - ArrayInfo response = api.registerArray(namespace, array, arrayMetadata); + ArrayInfo response = api.registerArray(workspace, teamspace, array, arrayMetadata); // TODO: test validations } @@ -508,10 +530,11 @@ public void registerArrayTest() throws ApiException { */ @Test public void shareArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArraySharing arraySharing = null; - api.shareArray(namespace, array, arraySharing); + api.shareArray(workspace, teamspace, array, arraySharing); // TODO: test validations } @@ -522,10 +545,11 @@ public void shareArrayTest() throws ApiException { */ @Test public void updateArrayMetadataTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArrayInfoUpdate arrayMetadata = null; - api.updateArrayMetadata(namespace, array, arrayMetadata); + api.updateArrayMetadata(workspace, teamspace, array, arrayMetadata); // TODO: test validations } @@ -536,10 +560,11 @@ public void updateArrayMetadataTest() throws ApiException { */ @Test public void updateArrayMetadataCapnpTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArrayMetadata arrayMetadataEntries = null; - api.updateArrayMetadataCapnp(namespace, array, arrayMetadataEntries); + api.updateArrayMetadataCapnp(workspace, teamspace, array, arrayMetadataEntries); // TODO: test validations } @@ -550,10 +575,11 @@ public void updateArrayMetadataCapnpTest() throws ApiException { */ @Test public void vacuumArrayTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArrayVacuumRequest vaccumRequest = null; - api.vacuumArray(namespace, array, vaccumRequest); + api.vacuumArray(workspace, teamspace, array, vaccumRequest); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/AssetsApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/AssetsApiTest.java index 51aa6f1..2d29b8d 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/AssetsApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/AssetsApiTest.java @@ -15,6 +15,7 @@ import io.tiledb.cloud.rest_api.ApiException; import io.tiledb.cloud.rest_api.model.AssetListResponse; +import io.tiledb.cloud.rest_api.model.ChangeAssetCredentialsRequest; import io.tiledb.cloud.rest_api.model.Error; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -32,6 +33,20 @@ public class AssetsApiTest { private final AssetsApi api = new AssetsApi(); + /** + * Changes the access credentials to the given assets + * + * @throws ApiException if the Api call fails + */ + @Test + public void changeAssetCredentialsTest() throws ApiException { + String workspace = null; + String teamspace = null; + ChangeAssetCredentialsRequest changeCredentialsRequest = null; + api.changeAssetCredentials(workspace, teamspace, changeCredentialsRequest); + // TODO: test validations + } + /** * List assets in a namespace * @@ -39,7 +54,8 @@ public class AssetsApiTest { */ @Test public void listAssetsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String assetType = null; String ownershipLevel = null; String depth = null; @@ -48,7 +64,7 @@ public void listAssetsTest() throws ApiException { Integer perPage = null; String orderBy = null; String expand = null; - AssetListResponse response = api.listAssets(namespace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand); + AssetListResponse response = api.listAssets(workspace, teamspace, assetType, ownershipLevel, depth, search, page, perPage, orderBy, expand); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/FavoritesApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/FavoritesApiTest.java index 495eefa..fc52832 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/FavoritesApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/FavoritesApiTest.java @@ -46,9 +46,10 @@ public class FavoritesApiTest { */ @Test public void addArrayFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.addArrayFavorite(namespace, name); + api.addArrayFavorite(workspace, teamspace, name); // TODO: test validations } @@ -59,9 +60,10 @@ public void addArrayFavoriteTest() throws ApiException { */ @Test public void addMLModelFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.addMLModelFavorite(namespace, name); + api.addMLModelFavorite(workspace, teamspace, name); // TODO: test validations } @@ -72,9 +74,10 @@ public void addMLModelFavoriteTest() throws ApiException { */ @Test public void addNotebookFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.addNotebookFavorite(namespace, name); + api.addNotebookFavorite(workspace, teamspace, name); // TODO: test validations } @@ -85,9 +88,9 @@ public void addNotebookFavoriteTest() throws ApiException { */ @Test public void addUDFFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - api.addUDFFavorite(namespace, name); + api.addUDFFavorite(workspace, name); // TODO: test validations } @@ -98,9 +101,10 @@ public void addUDFFavoriteTest() throws ApiException { */ @Test public void deleteArrayFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.deleteArrayFavorite(namespace, name); + api.deleteArrayFavorite(workspace, teamspace, name); // TODO: test validations } @@ -111,9 +115,10 @@ public void deleteArrayFavoriteTest() throws ApiException { */ @Test public void deleteMLModelFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.deleteMLModelFavorite(namespace, name); + api.deleteMLModelFavorite(workspace, teamspace, name); // TODO: test validations } @@ -124,9 +129,10 @@ public void deleteMLModelFavoriteTest() throws ApiException { */ @Test public void deleteNotebookFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.deleteNotebookFavorite(namespace, name); + api.deleteNotebookFavorite(workspace, teamspace, name); // TODO: test validations } @@ -137,9 +143,9 @@ public void deleteNotebookFavoriteTest() throws ApiException { */ @Test public void deleteUDFFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - api.deleteUDFFavorite(namespace, name); + api.deleteUDFFavorite(workspace, name); // TODO: test validations } @@ -150,9 +156,10 @@ public void deleteUDFFavoriteTest() throws ApiException { */ @Test public void getArrayFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - ArrayFavorite response = api.getArrayFavorite(namespace, name); + ArrayFavorite response = api.getArrayFavorite(workspace, teamspace, name); // TODO: test validations } @@ -163,9 +170,10 @@ public void getArrayFavoriteTest() throws ApiException { */ @Test public void getMLModelFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - MLModelFavorite response = api.getMLModelFavorite(namespace, name); + MLModelFavorite response = api.getMLModelFavorite(workspace, teamspace, name); // TODO: test validations } @@ -176,9 +184,10 @@ public void getMLModelFavoriteTest() throws ApiException { */ @Test public void getNotebookFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - NotebookFavorite response = api.getNotebookFavorite(namespace, name); + NotebookFavorite response = api.getNotebookFavorite(workspace, teamspace, name); // TODO: test validations } @@ -189,9 +198,9 @@ public void getNotebookFavoriteTest() throws ApiException { */ @Test public void getUDFFavoriteTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - UDFFavorite response = api.getUDFFavorite(namespace, name); + UDFFavorite response = api.getUDFFavorite(workspace, name); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/FilesApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/FilesApiTest.java index 8978371..0bd78a0 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/FilesApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/FilesApiTest.java @@ -44,10 +44,11 @@ public class FilesApiTest { */ @Test public void handleCreateFileTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; FileCreate fileCreate = null; String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = null; - FileCreated response = api.handleCreateFile(namespace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); + FileCreated response = api.handleCreateFile(workspace, teamspace, fileCreate, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME); // TODO: test validations } @@ -58,10 +59,11 @@ public void handleCreateFileTest() throws ApiException { */ @Test public void handleExportFileTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String _file = null; FileExport fileExport = null; - FileExported response = api.handleExportFile(namespace, _file, fileExport); + FileExported response = api.handleExportFile(workspace, teamspace, _file, fileExport); // TODO: test validations } @@ -72,12 +74,13 @@ public void handleExportFileTest() throws ApiException { */ @Test public void handleUploadFileTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; File inputFile = null; String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = null; String outputUri = null; String name = null; - FileUploaded response = api.handleUploadFile(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); + FileUploaded response = api.handleUploadFile(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/GroupsApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/GroupsApiTest.java index 87baa46..c16f530 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/GroupsApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/GroupsApiTest.java @@ -50,10 +50,11 @@ public class GroupsApiTest { */ @Test public void changeGroupContentsTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; GroupChanges groupChanges = null; - api.changeGroupContents(groupNamespace, groupName, groupChanges); + api.changeGroupContents(workspace, teamspace, groupName, groupChanges); // TODO: test validations } @@ -64,9 +65,10 @@ public void changeGroupContentsTest() throws ApiException { */ @Test public void createGroupTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; GroupCreate groupCreate = null; - api.createGroup(namespace, groupCreate); + api.createGroup(workspace, teamspace, groupCreate); // TODO: test validations } @@ -77,9 +79,10 @@ public void createGroupTest() throws ApiException { */ @Test public void deleteGroupTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; - api.deleteGroup(groupNamespace, groupName); + api.deleteGroup(workspace, teamspace, groupName); // TODO: test validations } @@ -90,9 +93,10 @@ public void deleteGroupTest() throws ApiException { */ @Test public void getGroupTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; - GroupInfo response = api.getGroup(groupNamespace, groupName); + GroupInfo response = api.getGroup(workspace, teamspace, groupName); // TODO: test validations } @@ -103,11 +107,12 @@ public void getGroupTest() throws ApiException { */ @Test public void getGroupActivityTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; Integer page = null; Integer perPage = null; - GroupContentActivityResponse response = api.getGroupActivity(groupNamespace, groupName, page, perPage); + GroupContentActivityResponse response = api.getGroupActivity(workspace, teamspace, groupName, page, perPage); // TODO: test validations } @@ -118,7 +123,8 @@ public void getGroupActivityTest() throws ApiException { */ @Test public void getGroupContentsTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; Integer page = null; Integer perPage = null; @@ -129,7 +135,7 @@ public void getGroupContentsTest() throws ApiException { List excludeTag = null; List memberType = null; List excludeMemberType = null; - GroupContents response = api.getGroupContents(groupNamespace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType); + GroupContents response = api.getGroupContents(workspace, teamspace, groupName, page, perPage, namespace, search, orderby, tag, excludeTag, memberType, excludeMemberType); // TODO: test validations } @@ -140,9 +146,10 @@ public void getGroupContentsTest() throws ApiException { */ @Test public void getGroupSharingPoliciesTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; - List response = api.getGroupSharingPolicies(groupNamespace, groupName); + List response = api.getGroupSharingPolicies(workspace, teamspace, groupName); // TODO: test validations } @@ -187,10 +194,11 @@ public void groupsBrowserSharedFiltersGetTest() throws ApiException { * @throws ApiException if the Api call fails */ @Test - public void groupsGroupNamespaceGroupNameContentsFiltersGetTest() throws ApiException { - String groupNamespace = null; + public void groupsWorkspaceTeamspaceGroupNameContentsFiltersGetTest() throws ApiException { + String workspace = null; + String teamspace = null; String groupName = null; - GroupContentsFilterData response = api.groupsGroupNamespaceGroupNameContentsFiltersGet(groupNamespace, groupName); + GroupContentsFilterData response = api.groupsWorkspaceTeamspaceGroupNameContentsFiltersGet(workspace, teamspace, groupName); // TODO: test validations } @@ -271,10 +279,11 @@ public void listSharedGroupsTest() throws ApiException { */ @Test public void registerGroupTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; GroupRegister groupRegister = null; - api.registerGroup(namespace, array, groupRegister); + api.registerGroup(workspace, teamspace, array, groupRegister); // TODO: test validations } @@ -285,10 +294,11 @@ public void registerGroupTest() throws ApiException { */ @Test public void shareGroupTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; GroupSharingRequest groupSharingRequest = null; - api.shareGroup(groupNamespace, groupName, groupSharingRequest); + api.shareGroup(workspace, teamspace, groupName, groupSharingRequest); // TODO: test validations } @@ -299,10 +309,11 @@ public void shareGroupTest() throws ApiException { */ @Test public void updateGroupTest() throws ApiException { - String groupNamespace = null; + String workspace = null; + String teamspace = null; String groupName = null; GroupUpdate groupUpdate = null; - api.updateGroup(groupNamespace, groupName, groupUpdate); + api.updateGroup(workspace, teamspace, groupName, groupUpdate); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/InvitationApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/InvitationApiTest.java index a8d4ff7..75fdca6 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/InvitationApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/InvitationApiTest.java @@ -69,10 +69,11 @@ public void cancelJoinOrganizationTest() throws ApiException { */ @Test public void cancelShareArrayByInviteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String invitation = null; String array = null; - api.cancelShareArrayByInvite(namespace, invitation, array); + api.cancelShareArrayByInvite(workspace, teamspace, invitation, array); // TODO: test validations } @@ -83,10 +84,11 @@ public void cancelShareArrayByInviteTest() throws ApiException { */ @Test public void cancelShareGroupByInviteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String invitation = null; String groupName = null; - api.cancelShareGroupByInvite(namespace, invitation, groupName); + api.cancelShareGroupByInvite(workspace, teamspace, invitation, groupName); // TODO: test validations } @@ -97,9 +99,10 @@ public void cancelShareGroupByInviteTest() throws ApiException { */ @Test public void cancelSharePaymentTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String target = null; - api.cancelSharePayment(namespace, target); + api.cancelSharePayment(workspace, teamspace, target); // TODO: test validations } @@ -144,10 +147,11 @@ public void joinOrganizationTest() throws ApiException { */ @Test public void shareArrayByInviteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; InvitationArrayShareEmail emailInvite = null; - api.shareArrayByInvite(namespace, array, emailInvite); + api.shareArrayByInvite(workspace, teamspace, array, emailInvite); // TODO: test validations } @@ -158,10 +162,11 @@ public void shareArrayByInviteTest() throws ApiException { */ @Test public void shareGroupByInviteTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String group = null; InvitationGroupShareEmail emailInvite = null; - api.shareGroupByInvite(namespace, group, emailInvite); + api.shareGroupByInvite(workspace, teamspace, group, emailInvite); // TODO: test validations } @@ -172,9 +177,10 @@ public void shareGroupByInviteTest() throws ApiException { */ @Test public void sharePaymentTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; SharePaymentRequest emailInvite = null; - api.sharePayment(namespace, emailInvite); + api.sharePayment(workspace, teamspace, emailInvite); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/NotebookApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/NotebookApiTest.java index 46da52d..d607fd9 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/NotebookApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/NotebookApiTest.java @@ -44,8 +44,9 @@ public class NotebookApiTest { */ @Test public void getNotebookServerStatusTest() throws ApiException { - String namespace = null; - NotebookStatus response = api.getNotebookServerStatus(namespace); + String workspace = null; + String teamspace = null; + NotebookStatus response = api.getNotebookServerStatus(workspace, teamspace); // TODO: test validations } @@ -56,12 +57,13 @@ public void getNotebookServerStatusTest() throws ApiException { */ @Test public void handleCopyNotebookTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; NotebookCopy notebookCopy = null; String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = null; Integer endTimestamp = null; - NotebookCopied response = api.handleCopyNotebook(namespace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); + NotebookCopied response = api.handleCopyNotebook(workspace, teamspace, array, notebookCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); // TODO: test validations } @@ -72,12 +74,13 @@ public void handleCopyNotebookTest() throws ApiException { */ @Test public void handleUploadNotebookTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; File inputFile = null; String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = null; String outputUri = null; String name = null; - FileUploaded response = api.handleUploadNotebook(namespace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); + FileUploaded response = api.handleUploadNotebook(workspace, teamspace, inputFile, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, outputUri, name); // TODO: test validations } @@ -88,8 +91,9 @@ public void handleUploadNotebookTest() throws ApiException { */ @Test public void shutdownNotebookServerTest() throws ApiException { - String namespace = null; - api.shutdownNotebookServer(namespace); + String workspace = null; + String teamspace = null; + api.shutdownNotebookServer(workspace, teamspace); // TODO: test validations } @@ -100,10 +104,11 @@ public void shutdownNotebookServerTest() throws ApiException { */ @Test public void updateNotebookNameTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; ArrayInfoUpdate notebookMetadata = null; - api.updateNotebookName(namespace, array, notebookMetadata); + api.updateNotebookName(workspace, teamspace, array, notebookMetadata); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/NotebooksApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/NotebooksApiTest.java index f5d9032..34cc361 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/NotebooksApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/NotebooksApiTest.java @@ -38,12 +38,13 @@ public class NotebooksApiTest { * @throws ApiException if the Api call fails */ @Test - public void notebooksNamespaceArrayEndTimestampsGetTest() throws ApiException { - String namespace = null; + public void notebooksWorkspaceTeamspaceArrayEndTimestampsGetTest() throws ApiException { + String workspace = null; + String teamspace = null; String array = null; Integer page = null; Integer perPage = null; - ArrayEndTimestampData response = api.notebooksNamespaceArrayEndTimestampsGet(namespace, array, page, perPage); + ArrayEndTimestampData response = api.notebooksWorkspaceTeamspaceArrayEndTimestampsGet(workspace, teamspace, array, page, perPage); // TODO: test validations } @@ -53,11 +54,12 @@ public void notebooksNamespaceArrayEndTimestampsGetTest() throws ApiException { * @throws ApiException if the Api call fails */ @Test - public void notebooksNamespaceArrayPrunePostTest() throws ApiException { - String namespace = null; + public void notebooksWorkspaceTeamspaceArrayPrunePostTest() throws ApiException { + String workspace = null; + String teamspace = null; String array = null; Integer keepVersions = null; - api.notebooksNamespaceArrayPrunePost(namespace, array, keepVersions); + api.notebooksWorkspaceTeamspaceArrayPrunePost(workspace, teamspace, array, keepVersions); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/OrganizationApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/OrganizationApiTest.java index e420edb..f6b6448 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/OrganizationApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/OrganizationApiTest.java @@ -45,9 +45,10 @@ public class OrganizationApiTest { */ @Test public void addAWSAccessCredentialsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; AWSAccessCredentials awsAccessCredentials = null; - api.addAWSAccessCredentials(namespace, awsAccessCredentials); + api.addAWSAccessCredentials(workspace, teamspace, awsAccessCredentials); // TODO: test validations } @@ -71,8 +72,9 @@ public void addUserToOrganizationTest() throws ApiException { */ @Test public void checkAWSAccessCredentialsTest() throws ApiException { - String namespace = null; - List response = api.checkAWSAccessCredentials(namespace); + String workspace = null; + String teamspace = null; + List response = api.checkAWSAccessCredentials(workspace, teamspace); // TODO: test validations } @@ -83,9 +85,10 @@ public void checkAWSAccessCredentialsTest() throws ApiException { */ @Test public void checkAWSAccessCredentialsByNameTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - AWSAccessCredentials response = api.checkAWSAccessCredentialsByName(namespace, name); + AWSAccessCredentials response = api.checkAWSAccessCredentialsByName(workspace, teamspace, name); // TODO: test validations } @@ -134,9 +137,10 @@ public void createSSODomainTest() throws ApiException { */ @Test public void deleteAWSAccessCredentialsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.deleteAWSAccessCredentials(namespace, name); + api.deleteAWSAccessCredentials(workspace, teamspace, name); // TODO: test validations } @@ -246,10 +250,11 @@ public void getSSODomainsTest() throws ApiException { */ @Test public void updateAWSAccessCredentialsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; AWSAccessCredentials awsAccessCredentials = null; - api.updateAWSAccessCredentials(namespace, name, awsAccessCredentials); + api.updateAWSAccessCredentials(workspace, teamspace, name, awsAccessCredentials); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/QueryApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/QueryApiTest.java index 70d5f4f..ec6f13b 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/QueryApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/QueryApiTest.java @@ -41,14 +41,15 @@ public class QueryApiTest { */ @Test public void finalizeQueryTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String type = null; String contentType = null; Query query = null; String xPayer = null; Integer openAt = null; - Query response = api.finalizeQuery(namespace, array, type, contentType, query, xPayer, openAt); + Query response = api.finalizeQuery(workspace, teamspace, array, type, contentType, query, xPayer, openAt); // TODO: test validations } @@ -59,14 +60,15 @@ public void finalizeQueryTest() throws ApiException { */ @Test public void getEstResultSizesTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String type = null; String contentType = null; Query query = null; String xPayer = null; Integer openAt = null; - Query response = api.getEstResultSizes(namespace, array, type, contentType, query, xPayer, openAt); + Query response = api.getEstResultSizes(workspace, teamspace, array, type, contentType, query, xPayer, openAt); // TODO: test validations } @@ -77,11 +79,12 @@ public void getEstResultSizesTest() throws ApiException { */ @Test public void getFileTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; String xPayer = null; - File response = api.getFile(namespace, array, contentType, xPayer); + File response = api.getFile(workspace, teamspace, array, contentType, xPayer); // TODO: test validations } @@ -92,14 +95,15 @@ public void getFileTest() throws ApiException { */ @Test public void submitQueryTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String type = null; String contentType = null; Query query = null; String xPayer = null; Integer openAt = null; - Query response = api.submitQuery(namespace, array, type, contentType, query, xPayer, openAt); + Query response = api.submitQuery(workspace, teamspace, array, type, contentType, query, xPayer, openAt); // TODO: test validations } @@ -110,12 +114,13 @@ public void submitQueryTest() throws ApiException { */ @Test public void submitQueryJsonTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; String contentType = null; QueryJson queryJson = null; String xPayer = null; - Object response = api.submitQueryJson(namespace, array, contentType, queryJson, xPayer); + Object response = api.submitQueryJson(workspace, teamspace, array, contentType, queryJson, xPayer); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApiTest.java index 92537dd..25bbb5c 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/RegisteredTaskGraphsApiTest.java @@ -40,9 +40,9 @@ public class RegisteredTaskGraphsApiTest { */ @Test public void deleteRegisteredTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - api.deleteRegisteredTaskGraph(namespace, name); + api.deleteRegisteredTaskGraph(workspace, name); // TODO: test validations } @@ -53,9 +53,9 @@ public void deleteRegisteredTaskGraphTest() throws ApiException { */ @Test public void getRegisteredTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - RegisteredTaskGraph response = api.getRegisteredTaskGraph(namespace, name); + RegisteredTaskGraph response = api.getRegisteredTaskGraph(workspace, name); // TODO: test validations } @@ -66,9 +66,9 @@ public void getRegisteredTaskGraphTest() throws ApiException { */ @Test public void getRegisteredTaskGraphSharingPoliciesTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - List response = api.getRegisteredTaskGraphSharingPolicies(namespace, name); + List response = api.getRegisteredTaskGraphSharingPolicies(workspace, name); // TODO: test validations } @@ -79,10 +79,10 @@ public void getRegisteredTaskGraphSharingPoliciesTest() throws ApiException { */ @Test public void registerRegisteredTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; RegisteredTaskGraph graph = null; - api.registerRegisteredTaskGraph(namespace, name, graph); + api.registerRegisteredTaskGraph(workspace, name, graph); // TODO: test validations } @@ -93,10 +93,10 @@ public void registerRegisteredTaskGraphTest() throws ApiException { */ @Test public void shareRegisteredTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; TaskGraphSharing taskGraphSharing = null; - api.shareRegisteredTaskGraph(namespace, name, taskGraphSharing); + api.shareRegisteredTaskGraph(workspace, name, taskGraphSharing); // TODO: test validations } @@ -107,10 +107,10 @@ public void shareRegisteredTaskGraphTest() throws ApiException { */ @Test public void updateRegisteredTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; RegisteredTaskGraph graph = null; - api.updateRegisteredTaskGraph(namespace, name, graph); + api.updateRegisteredTaskGraph(workspace, name, graph); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/SqlApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/SqlApiTest.java index 4c91f3b..35dfa82 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/SqlApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/SqlApiTest.java @@ -39,10 +39,11 @@ public class SqlApiTest { */ @Test public void runSQLTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; SQLParameters sql = null; String acceptEncoding = null; - List> response = api.runSQL(namespace, sql, acceptEncoding); + List> response = api.runSQL(workspace, teamspace, sql, acceptEncoding); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApiTest.java index 5e928e0..47ca575 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphLogsApiTest.java @@ -42,9 +42,9 @@ public class TaskGraphLogsApiTest { */ @Test public void createTaskGraphLogTest() throws ApiException { - String namespace = null; + String workspace = null; TaskGraphLog log = null; - TaskGraphLog response = api.createTaskGraphLog(namespace, log); + TaskGraphLog response = api.createTaskGraphLog(workspace, log); // TODO: test validations } @@ -55,9 +55,9 @@ public void createTaskGraphLogTest() throws ApiException { */ @Test public void getTaskGraphLogTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - TaskGraphLog response = api.getTaskGraphLog(namespace, id); + TaskGraphLog response = api.getTaskGraphLog(workspace, id); // TODO: test validations } @@ -85,10 +85,10 @@ public void listTaskGraphLogsTest() throws ApiException { */ @Test public void reportClientNodeTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; TaskGraphClientNodeStatus report = null; - api.reportClientNode(namespace, id, report); + api.reportClientNode(workspace, id, report); // TODO: test validations } @@ -99,9 +99,9 @@ public void reportClientNodeTest() throws ApiException { */ @Test public void resubmitTaskGraphExecutionTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - TaskGraphLog response = api.resubmitTaskGraphExecution(namespace, id); + TaskGraphLog response = api.resubmitTaskGraphExecution(workspace, id); // TODO: test validations } @@ -112,9 +112,9 @@ public void resubmitTaskGraphExecutionTest() throws ApiException { */ @Test public void retryTaskGraphExecutionTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - TaskGraphLog response = api.retryTaskGraphExecution(namespace, id); + TaskGraphLog response = api.retryTaskGraphExecution(workspace, id); // TODO: test validations } @@ -125,9 +125,9 @@ public void retryTaskGraphExecutionTest() throws ApiException { */ @Test public void stopTaskGraphExecutionTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - api.stopTaskGraphExecution(namespace, id); + api.stopTaskGraphExecution(workspace, id); // TODO: test validations } @@ -138,9 +138,10 @@ public void stopTaskGraphExecutionTest() throws ApiException { */ @Test public void submitTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - TaskGraphLog response = api.submitTaskGraph(namespace, id); + String rootTaskGraphUuid = null; + TaskGraphLog response = api.submitTaskGraph(workspace, id, rootTaskGraphUuid); // TODO: test validations } @@ -151,10 +152,10 @@ public void submitTaskGraphTest() throws ApiException { */ @Test public void updateTaskGraphLogTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; TaskGraphLog log = null; - api.updateTaskGraphLog(namespace, id, log); + api.updateTaskGraphLog(workspace, id, log); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphsApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphsApiTest.java index bc63a7b..3baf564 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphsApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/TaskGraphsApiTest.java @@ -41,9 +41,9 @@ public class TaskGraphsApiTest { */ @Test public void createTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; TaskGraph graph = null; - TaskGraph response = api.createTaskGraph(namespace, graph); + TaskGraph response = api.createTaskGraph(workspace, graph); // TODO: test validations } @@ -54,9 +54,9 @@ public void createTaskGraphTest() throws ApiException { */ @Test public void getTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - TaskGraph response = api.getTaskGraph(namespace, id); + TaskGraph response = api.getTaskGraph(workspace, id); // TODO: test validations } @@ -67,8 +67,8 @@ public void getTaskGraphTest() throws ApiException { */ @Test public void listTaskGraphsTest() throws ApiException { - String namespace = null; - TaskGraphs response = api.listTaskGraphs(namespace); + String workspace = null; + TaskGraphs response = api.listTaskGraphs(workspace); // TODO: test validations } @@ -79,9 +79,10 @@ public void listTaskGraphsTest() throws ApiException { */ @Test public void submitTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; - TaskGraphLog response = api.submitTaskGraph(namespace, id); + String rootTaskGraphUuid = null; + TaskGraphLog response = api.submitTaskGraph(workspace, id, rootTaskGraphUuid); // TODO: test validations } @@ -92,10 +93,10 @@ public void submitTaskGraphTest() throws ApiException { */ @Test public void updateTaskGraphTest() throws ApiException { - String namespace = null; + String workspace = null; String id = null; TaskGraph graph = null; - api.updateTaskGraph(namespace, id, graph); + api.updateTaskGraph(workspace, id, graph); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/TasksApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/TasksApiTest.java index a50188e..2bd411d 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/TasksApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/TasksApiTest.java @@ -41,10 +41,11 @@ public class TasksApiTest { */ @Test public void runSQLTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; SQLParameters sql = null; String acceptEncoding = null; - List> response = api.runSQL(namespace, sql, acceptEncoding); + List> response = api.runSQL(workspace, teamspace, sql, acceptEncoding); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/UdfApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/UdfApiTest.java index 6fbd5f5..c178e1c 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/UdfApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/UdfApiTest.java @@ -47,9 +47,9 @@ public class UdfApiTest { */ @Test public void deleteUDFInfoTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - api.deleteUDFInfo(namespace, name); + api.deleteUDFInfo(workspace, name); // TODO: test validations } @@ -60,9 +60,9 @@ public void deleteUDFInfoTest() throws ApiException { */ @Test public void getUDFInfoTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - UDFInfo response = api.getUDFInfo(namespace, name); + UDFInfo response = api.getUDFInfo(workspace, name); // TODO: test validations } @@ -73,9 +73,9 @@ public void getUDFInfoTest() throws ApiException { */ @Test public void getUDFInfoSharingPoliciesTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; - List response = api.getUDFInfoSharingPolicies(namespace, name); + List response = api.getUDFInfoSharingPolicies(workspace, name); // TODO: test validations } @@ -86,12 +86,12 @@ public void getUDFInfoSharingPoliciesTest() throws ApiException { */ @Test public void handleCopyUDFTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; UDFCopy udFCopy = null; String X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME = null; Integer endTimestamp = null; - UDFCopied response = api.handleCopyUDF(namespace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); + UDFCopied response = api.handleCopyUDF(workspace, name, udFCopy, X_TILEDB_CLOUD_ACCESS_CREDENTIALS_NAME, endTimestamp); // TODO: test validations } @@ -102,10 +102,10 @@ public void handleCopyUDFTest() throws ApiException { */ @Test public void registerUDFInfoTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; UDFInfoUpdate udf = null; - api.registerUDFInfo(namespace, name, udf); + api.registerUDFInfo(workspace, name, udf); // TODO: test validations } @@ -116,10 +116,10 @@ public void registerUDFInfoTest() throws ApiException { */ @Test public void shareUDFInfoTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; UDFSharing udfSharing = null; - api.shareUDFInfo(namespace, name, udfSharing); + api.shareUDFInfo(workspace, name, udfSharing); // TODO: test validations } @@ -130,10 +130,10 @@ public void shareUDFInfoTest() throws ApiException { */ @Test public void submitGenericUDFTest() throws ApiException { - String namespace = null; + String workspace = null; GenericUDF udf = null; String acceptEncoding = null; - File response = api.submitGenericUDF(namespace, udf, acceptEncoding); + File response = api.submitGenericUDF(workspace, udf, acceptEncoding); // TODO: test validations } @@ -144,10 +144,10 @@ public void submitGenericUDFTest() throws ApiException { */ @Test public void submitMultiArrayUDFTest() throws ApiException { - String namespace = null; + String workspace = null; MultiArrayUDF udf = null; String acceptEncoding = null; - File response = api.submitMultiArrayUDF(namespace, udf, acceptEncoding); + File response = api.submitMultiArrayUDF(workspace, udf, acceptEncoding); // TODO: test validations } @@ -158,13 +158,14 @@ public void submitMultiArrayUDFTest() throws ApiException { */ @Test public void submitUDFTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String array = null; MultiArrayUDF udf = null; String xPayer = null; String acceptEncoding = null; String v2 = null; - File response = api.submitUDF(namespace, array, udf, xPayer, acceptEncoding, v2); + File response = api.submitUDF(workspace, teamspace, array, udf, xPayer, acceptEncoding, v2); // TODO: test validations } @@ -174,12 +175,12 @@ public void submitUDFTest() throws ApiException { * @throws ApiException if the Api call fails */ @Test - public void udfNamespaceArrayEndTimestampsGetTest() throws ApiException { - String namespace = null; + public void udfWorkspaceArrayEndTimestampsGetTest() throws ApiException { + String workspace = null; String array = null; Integer page = null; Integer perPage = null; - ArrayEndTimestampData response = api.udfNamespaceArrayEndTimestampsGet(namespace, array, page, perPage); + ArrayEndTimestampData response = api.udfWorkspaceArrayEndTimestampsGet(workspace, array, page, perPage); // TODO: test validations } @@ -190,10 +191,10 @@ public void udfNamespaceArrayEndTimestampsGetTest() throws ApiException { */ @Test public void updateUDFInfoTest() throws ApiException { - String namespace = null; + String workspace = null; String name = null; UDFInfoUpdate udf = null; - api.updateUDFInfo(namespace, name, udf); + api.updateUDFInfo(workspace, name, udf); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/api/UserApiTest.java b/src/test/java/io/tiledb/cloud/rest_api/api/UserApiTest.java index b84fd7a..dcd9e1c 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/api/UserApiTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/api/UserApiTest.java @@ -16,6 +16,7 @@ import io.tiledb.cloud.rest_api.ApiException; import io.tiledb.cloud.rest_api.model.AWSAccessCredentials; import io.tiledb.cloud.rest_api.model.Error; +import java.time.OffsetDateTime; import io.tiledb.cloud.rest_api.model.OrganizationUser; import io.tiledb.cloud.rest_api.model.ResetUserPasswordRequest; import io.tiledb.cloud.rest_api.model.Token; @@ -45,9 +46,10 @@ public class UserApiTest { */ @Test public void addAWSAccessCredentialsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; AWSAccessCredentials awsAccessCredentials = null; - api.addAWSAccessCredentials(namespace, awsAccessCredentials); + api.addAWSAccessCredentials(workspace, teamspace, awsAccessCredentials); // TODO: test validations } @@ -71,8 +73,9 @@ public void addUserToOrganizationTest() throws ApiException { */ @Test public void checkAWSAccessCredentialsTest() throws ApiException { - String namespace = null; - List response = api.checkAWSAccessCredentials(namespace); + String workspace = null; + String teamspace = null; + List response = api.checkAWSAccessCredentials(workspace, teamspace); // TODO: test validations } @@ -83,9 +86,10 @@ public void checkAWSAccessCredentialsTest() throws ApiException { */ @Test public void checkAWSAccessCredentialsByNameTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - AWSAccessCredentials response = api.checkAWSAccessCredentialsByName(namespace, name); + AWSAccessCredentials response = api.checkAWSAccessCredentialsByName(workspace, teamspace, name); // TODO: test validations } @@ -119,9 +123,10 @@ public void createUserTest() throws ApiException { */ @Test public void deleteAWSAccessCredentialsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; - api.deleteAWSAccessCredentials(namespace, name); + api.deleteAWSAccessCredentials(workspace, teamspace, name); // TODO: test validations } @@ -171,7 +176,8 @@ public void getOrganizationUserTest() throws ApiException { @Test public void getSessionTest() throws ApiException { String rememberMe = null; - Token response = api.getSession(rememberMe); + OffsetDateTime expires = null; + Token response = api.getSession(rememberMe, expires); // TODO: test validations } @@ -274,10 +280,11 @@ public void tokensSessionGetTest() throws ApiException { */ @Test public void updateAWSAccessCredentialsTest() throws ApiException { - String namespace = null; + String workspace = null; + String teamspace = null; String name = null; AWSAccessCredentials awsAccessCredentials = null; - api.updateAWSAccessCredentials(namespace, name, awsAccessCredentials); + api.updateAWSAccessCredentials(workspace, teamspace, name, awsAccessCredentials); // TODO: test validations } diff --git a/src/test/java/io/tiledb/cloud/rest_api/model/ArrayInfoTest.java b/src/test/java/io/tiledb/cloud/rest_api/model/ArrayInfoTest.java index b532440..e9fd0d0 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/model/ArrayInfoTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/model/ArrayInfoTest.java @@ -58,6 +58,14 @@ public void idTest() { // TODO: test id } + /** + * Test the property 'assetId' + */ + @Test + public void assetIdTest() { + // TODO: test assetId + } + /** * Test the property 'fileType' */ diff --git a/src/test/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequestTest.java b/src/test/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequestTest.java new file mode 100644 index 0000000..efd5284 --- /dev/null +++ b/src/test/java/io/tiledb/cloud/rest_api/model/ChangeAssetCredentialsRequestTest.java @@ -0,0 +1,58 @@ +/* + * TileDB Storage Platform API + * TileDB Storage Platform REST API + * + * The version of the OpenAPI document: 2.17.51 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package io.tiledb.cloud.rest_api.model; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for ChangeAssetCredentialsRequest + */ +public class ChangeAssetCredentialsRequestTest { + private final ChangeAssetCredentialsRequest model = new ChangeAssetCredentialsRequest(); + + /** + * Model tests for ChangeAssetCredentialsRequest + */ + @Test + public void testChangeAssetCredentialsRequest() { + // TODO: test ChangeAssetCredentialsRequest + } + + /** + * Test the property 'accessCredentials' + */ + @Test + public void accessCredentialsTest() { + // TODO: test accessCredentials + } + + /** + * Test the property 'assetUuids' + */ + @Test + public void assetUuidsTest() { + // TODO: test assetUuids + } + +} diff --git a/src/test/java/io/tiledb/cloud/rest_api/model/FileUploadedTest.java b/src/test/java/io/tiledb/cloud/rest_api/model/FileUploadedTest.java index de13834..ac1aa1d 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/model/FileUploadedTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/model/FileUploadedTest.java @@ -53,6 +53,14 @@ public void fileNameTest() { // TODO: test fileName } + /** + * Test the property 'assetId' + */ + @Test + public void assetIdTest() { + // TODO: test assetId + } + /** * Test the property 'id' */ diff --git a/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentTest.java b/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentTest.java index 640771d..8a53301 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFEnvironmentTest.java @@ -19,6 +19,7 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; import io.tiledb.cloud.rest_api.model.TGUDFEnvironmentResources; +import io.tiledb.cloud.rest_api.model.TGUDFStorage; import io.tiledb.cloud.rest_api.model.UDFLanguage; import java.io.IOException; import java.math.BigDecimal; @@ -116,11 +117,11 @@ public void timeoutTest() { } /** - * Test the property 'paths' + * Test the property 'storage' */ @Test - public void pathsTest() { - // TODO: test paths + public void storageTest() { + // TODO: test storage } } diff --git a/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFStorageTest.java b/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFStorageTest.java index a1f0a25..f330c18 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFStorageTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/model/TGUDFStorageTest.java @@ -45,6 +45,14 @@ public void pathTest() { // TODO: test path } + /** + * Test the property 'tiledbUri' + */ + @Test + public void tiledbUriTest() { + // TODO: test tiledbUri + } + /** * Test the property 'size' */ diff --git a/src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogTest.java b/src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogTest.java index cd3943f..66c1274 100644 --- a/src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogTest.java +++ b/src/test/java/io/tiledb/cloud/rest_api/model/TaskGraphLogTest.java @@ -191,4 +191,20 @@ public void cloudRegionTest() { // TODO: test cloudRegion } + /** + * Test the property 'rootTaskGraphUuid' + */ + @Test + public void rootTaskGraphUuidTest() { + // TODO: test rootTaskGraphUuid + } + + /** + * Test the property 'childrenTaskGraphUuids' + */ + @Test + public void childrenTaskGraphUuidsTest() { + // TODO: test childrenTaskGraphUuids + } + }