From a8be7fc2f77e6dee917a2d6976a78c2dad9f4cc9 Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 8 Feb 2024 12:20:42 +0300 Subject: [PATCH] updated to 2024.1.17 --- .openapi-generator/FILES | 3 - README.md | 7 +- VERSION | 2 +- api/openapi.yaml | 165 +++++++--- build.gradle | 2 +- build.sbt | 2 +- docs/AdminExportFolderCreateVM.md | 3 - docs/AdminFolderCreateVM.md | 4 +- docs/AdminReportFolderCreateVM.md | 3 - docs/AdminSubscriptionVM.md | 8 - docs/AdminTemplateFolderCreateVM.md | 3 - docs/CreateDataSourceAdminVM.md | 4 - docs/CreateDataSourceVM.md | 1 + docs/CreateGroupAdminVM.md | 2 - docs/CreateGroupVM.md | 1 + docs/ExportCreateAdminVM.md | 4 - docs/ExportCreateVM.md | 5 +- docs/ExportFolderCreateVM.md | 3 - docs/FileCreateVM.md | 1 + docs/FileVM.md | 5 + docs/FolderCreateVM.md | 1 + docs/ReportCreateAdminVM.md | 4 - docs/ReportCreateVM.md | 5 +- docs/ReportFolderCreateVM.md | 3 - docs/SubscriptionVM.md | 1 + docs/TemplateCreateAdminVM.md | 4 - docs/TemplateCreateVM.md | 5 +- docs/TemplateFolderCreateVM.md | 3 - pom.xml | 2 +- .../cloud/fastreport/client/ExportsApi.java | 1 + .../cloud/fastreport/client/ReportsApi.java | 1 + .../cloud/fastreport/client/TemplatesApi.java | 1 + .../model/AdminExportFolderCreateVM.java | 147 ++------- .../fastreport/model/AdminFolderCreateVM.java | 160 +++------ .../model/AdminReportFolderCreateVM.java | 145 ++------- .../fastreport/model/AdminSubscriptionVM.java | 303 ++---------------- .../model/AdminTemplateFolderCreateVM.java | 145 ++------- .../model/AuditFilePropertyChangedVM.java | 14 +- .../model/AuditSubscriptionActionVM.java | 14 +- .../fastreport/model/AuditTaskActionVM.java | 14 +- .../model/CreateDataSourceAdminVM.java | 150 ++------- .../fastreport/model/CreateDataSourceVM.java | 51 ++- .../fastreport/model/CreateEmailTaskVM.java | 6 - .../fastreport/model/CreateGroupAdminVM.java | 87 ++--- .../cloud/fastreport/model/CreateGroupVM.java | 51 ++- .../fastreport/model/ExportCreateAdminVM.java | 186 ++--------- .../fastreport/model/ExportCreateVM.java | 193 +++-------- .../model/ExportFolderCreateVM.java | 145 ++------- .../java/cloud/fastreport/model/ExportVM.java | 78 +++++ .../cloud/fastreport/model/FileCreateVM.java | 56 +++- .../java/cloud/fastreport/model/FileVM.java | 218 +++++++++++-- .../fastreport/model/FolderCreateVM.java | 57 +++- .../fastreport/model/ReportCreateAdminVM.java | 186 ++--------- .../fastreport/model/ReportCreateVM.java | 193 +++-------- .../model/ReportFolderCreateVM.java | 145 ++------- .../java/cloud/fastreport/model/ReportVM.java | 78 +++++ .../fastreport/model/SubscriptionVM.java | 51 ++- .../model/TemplateCreateAdminVM.java | 186 ++--------- .../fastreport/model/TemplateCreateVM.java | 194 +++-------- .../model/TemplateFolderCreateVM.java | 145 ++------- .../cloud/fastreport/model/TemplateVM.java | 78 +++++ .../fastreport/client/ExportsApiTest.java | 1 + .../fastreport/client/ReportsApiTest.java | 1 + .../fastreport/client/TemplatesApiTest.java | 1 + .../model/AdminExportFolderCreateVMTest.java | 15 +- .../model/AdminFolderCreateVMTest.java | 15 +- .../model/AdminReportFolderCreateVMTest.java | 15 +- .../model/AdminSubscriptionVMTest.java | 12 + .../AdminTemplateFolderCreateVMTest.java | 15 +- .../model/CreateDataSourceAdminVMTest.java | 15 +- .../model/CreateDataSourceVMTest.java | 11 + .../model/CreateGroupAdminVMTest.java | 12 + .../fastreport/model/CreateGroupVMTest.java | 11 + .../model/ExportCreateAdminVMTest.java | 15 +- .../fastreport/model/ExportCreateVMTest.java | 12 + .../model/ExportFolderCreateVMTest.java | 15 +- .../cloud/fastreport/model/ExportVMTest.java | 94 ++++++ .../fastreport/model/FileCreateVMTest.java | 11 + .../cloud/fastreport/model/FileVMTest.java | 89 ++++- .../fastreport/model/FolderCreateVMTest.java | 11 + .../model/ReportCreateAdminVMTest.java | 15 +- .../fastreport/model/ReportCreateVMTest.java | 12 + .../model/ReportFolderCreateVMTest.java | 15 +- .../cloud/fastreport/model/ReportVMTest.java | 94 ++++++ .../fastreport/model/SubscriptionVMTest.java | 11 + .../model/TemplateCreateAdminVMTest.java | 15 +- .../model/TemplateCreateVMTest.java | 15 +- .../model/TemplateFolderCreateVMTest.java | 15 +- .../fastreport/model/TemplateVMTest.java | 94 ++++++ 89 files changed, 1931 insertions(+), 2461 deletions(-) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 3cd298c..359773d 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -78,7 +78,6 @@ docs/DeleteApiKeyVM.md docs/DownloadApi.md docs/EmailTaskVM.md docs/EntityType.md -docs/EntityVM.md docs/ExportCreateAdminVM.md docs/ExportCreateVM.md docs/ExportFolderCreateVM.md @@ -362,7 +361,6 @@ src/main/java/cloud/fastreport/model/DefaultPermissionsVM.java src/main/java/cloud/fastreport/model/DeleteApiKeyVM.java src/main/java/cloud/fastreport/model/EmailTaskVM.java src/main/java/cloud/fastreport/model/EntityType.java -src/main/java/cloud/fastreport/model/EntityVM.java src/main/java/cloud/fastreport/model/ExportCreateAdminVM.java src/main/java/cloud/fastreport/model/ExportCreateVM.java src/main/java/cloud/fastreport/model/ExportFolderCreateVM.java @@ -617,7 +615,6 @@ src/test/java/cloud/fastreport/model/DefaultPermissionsVMTest.java src/test/java/cloud/fastreport/model/DeleteApiKeyVMTest.java src/test/java/cloud/fastreport/model/EmailTaskVMTest.java src/test/java/cloud/fastreport/model/EntityTypeTest.java -src/test/java/cloud/fastreport/model/EntityVMTest.java src/test/java/cloud/fastreport/model/ExportCreateAdminVMTest.java src/test/java/cloud/fastreport/model/ExportCreateVMTest.java src/test/java/cloud/fastreport/model/ExportFolderCreateVMTest.java diff --git a/README.md b/README.md index 7b82334..7fe7e1c 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Add this dependency to your project's POM: cloud.fastreport.sdk fastreport-cloud-sdk - 2024.1.16 + 2024.1.17 compile ``` @@ -44,7 +44,7 @@ Add this dependency to your project's POM: Add this dependency to your project's build file: ```groovy -compile "cloud.fastreport.sdk:fastreport-cloud-sdk:2024.1.16" +compile "cloud.fastreport.sdk:fastreport-cloud-sdk:2024.1.17" ``` ### Others @@ -57,7 +57,7 @@ mvn clean package Then manually install the following JARs: -- `target/fastreport-cloud-sdk-2024.1.16.jar` +- `target/fastreport-cloud-sdk-2024.1.17.jar` - `target/lib/*.jar` ## Getting Started @@ -398,7 +398,6 @@ Class | Method | HTTP request | Description - [DeleteApiKeyVM](docs/DeleteApiKeyVM.md) - [EmailTaskVM](docs/EmailTaskVM.md) - [EntityType](docs/EntityType.md) - - [EntityVM](docs/EntityVM.md) - [ExportCreateAdminVM](docs/ExportCreateAdminVM.md) - [ExportCreateVM](docs/ExportCreateVM.md) - [ExportFolderCreateVM](docs/ExportFolderCreateVM.md) diff --git a/VERSION b/VERSION index d7ea127..c32ee0f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2024.1.16 \ No newline at end of file +2024.1.17 \ No newline at end of file diff --git a/api/openapi.yaml b/api/openapi.yaml index 0bd82b1..118aa62 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -13081,6 +13081,13 @@ components: additionalProperties: false allOf: - $ref: '#/components/schemas/FolderCreateVM' + discriminator: + mapping: + AdminFolderCreateVM: '#/components/schemas/AdminFolderCreateVM' + AdminExportFolderCreateVM: '#/components/schemas/AdminExportFolderCreateVM' + AdminReportFolderCreateVM: '#/components/schemas/AdminReportFolderCreateVM' + AdminTemplateFolderCreateVM: '#/components/schemas/AdminTemplateFolderCreateVM' + propertyName: $t properties: parentId: minLength: 1 @@ -13092,7 +13099,10 @@ components: type: string force: type: boolean + $t: + type: string required: + - $t - ownerId - parentId type: object @@ -13680,8 +13690,14 @@ components: type: object CreateDataSourceVM: additionalProperties: false + discriminator: + mapping: + CreateDataSourceAdminVM: '#/components/schemas/CreateDataSourceAdminVM' + CreateDataSourceVM: '#/components/schemas/CreateDataSourceVM' + propertyName: $t example: connectionString: connectionString + $t: $t name: name subscriptionId: subscriptionId connectionType: null @@ -13701,7 +13717,10 @@ components: type: string connectionType: $ref: '#/components/schemas/DataSourceConnectionType' + $t: + type: string required: + - $t - connectionString - subscriptionId type: object @@ -13852,7 +13871,13 @@ components: type: object CreateGroupVM: additionalProperties: false + discriminator: + mapping: + CreateGroupAdminVM: '#/components/schemas/CreateGroupAdminVM' + CreateGroupVM: '#/components/schemas/CreateGroupVM' + propertyName: $t example: + $t: $t name: name subscriptionId: subscriptionId properties: @@ -13864,7 +13889,10 @@ components: nullable: true pattern: "^[A-Fa-f0-9]{24}$" type: string + $t: + type: string required: + - $t - name type: object CreatePrepareTemplateTaskVM: @@ -14392,37 +14420,6 @@ components: - ExportFolder type: string x-typeName: FastReport.Cloud.Base.Enums.EntityType - EntityVM: - additionalProperties: false - discriminator: - mapping: - ExportVM: '#/components/schemas/ExportVM' - EntityVM: '#/components/schemas/EntityVM' - FileVM: '#/components/schemas/FileVM' - ReportVM: '#/components/schemas/ReportVM' - TemplateVM: '#/components/schemas/TemplateVM' - propertyName: $t - properties: - id: - nullable: true - type: string - createdTime: - format: date-time - type: string - creatorUserId: - nullable: true - type: string - editedTime: - format: date-time - type: string - editorUserId: - nullable: true - type: string - $t: - type: string - required: - - $t - type: object ExportCreateAdminVM: additionalProperties: false allOf: @@ -14444,6 +14441,11 @@ components: additionalProperties: false allOf: - $ref: '#/components/schemas/FileCreateVM' + discriminator: + mapping: + ExportCreateVM: '#/components/schemas/ExportCreateVM' + ExportCreateAdminVM: '#/components/schemas/ExportCreateAdminVM' + propertyName: $t properties: templateId: nullable: true @@ -14453,6 +14455,10 @@ components: nullable: true pattern: "(^$)|(^[A-Fa-f0-9]{24}$)" type: string + $t: + type: string + required: + - $t type: object ExportFolderCreateVM: additionalProperties: false @@ -14746,6 +14752,16 @@ components: type: object FileCreateVM: additionalProperties: false + discriminator: + mapping: + ExportCreateVM: '#/components/schemas/ExportCreateVM' + FileCreateVM: '#/components/schemas/FileCreateVM' + ReportCreateVM: '#/components/schemas/ReportCreateVM' + TemplateCreateVM: '#/components/schemas/TemplateCreateVM' + TemplateCreateAdminVM: '#/components/schemas/TemplateCreateAdminVM' + ReportCreateAdminVM: '#/components/schemas/ReportCreateAdminVM' + ExportCreateAdminVM: '#/components/schemas/ExportCreateAdminVM' + propertyName: $t properties: name: maxLength: 250 @@ -14770,6 +14786,10 @@ components: maxLength: 100000000 nullable: true type: string + $t: + type: string + required: + - $t type: object FileDelete: enum: @@ -14969,8 +14989,6 @@ components: x-typeName: FastReport.Cloud.Enums.FilePermissionsEnums.FileUpdate FileVM: additionalProperties: false - allOf: - - $ref: '#/components/schemas/EntityVM' discriminator: mapping: ExportVM: '#/components/schemas/ExportVM' @@ -14979,21 +14997,41 @@ components: TemplateVM: '#/components/schemas/TemplateVM' propertyName: $t example: - $t: $t - statusReason: null - size: 0 - isDeleted: true - name: name + creatorUserId: creatorUserId icon: icon errorMessage: errorMessage type: null - subscriptionId: subscriptionId parentId: parentId tags: - tags - tags + $t: $t + editedTime: 2000-01-23T04:56:07.000+00:00 + statusReason: null + size: 0 + isDeleted: true + editorUserId: editorUserId + name: name + createdTime: 2000-01-23T04:56:07.000+00:00 + id: id + subscriptionId: subscriptionId status: null properties: + id: + nullable: true + type: string + createdTime: + format: date-time + type: string + creatorUserId: + nullable: true + type: string + editedTime: + format: date-time + type: string + editorUserId: + nullable: true + type: string name: nullable: true type: string @@ -15056,6 +15094,17 @@ components: type: object FolderCreateVM: additionalProperties: false + discriminator: + mapping: + AdminFolderCreateVM: '#/components/schemas/AdminFolderCreateVM' + ExportFolderCreateVM: '#/components/schemas/ExportFolderCreateVM' + FolderCreateVM: '#/components/schemas/FolderCreateVM' + ReportFolderCreateVM: '#/components/schemas/ReportFolderCreateVM' + TemplateFolderCreateVM: '#/components/schemas/TemplateFolderCreateVM' + AdminExportFolderCreateVM: '#/components/schemas/AdminExportFolderCreateVM' + AdminReportFolderCreateVM: '#/components/schemas/AdminReportFolderCreateVM' + AdminTemplateFolderCreateVM: '#/components/schemas/AdminTemplateFolderCreateVM' + propertyName: $t properties: name: maxLength: 250 @@ -15075,6 +15124,10 @@ components: maxLength: 65536 nullable: true type: string + $t: + type: string + required: + - $t type: object FolderIconVM: additionalProperties: false @@ -15630,13 +15683,23 @@ components: additionalProperties: false allOf: - $ref: '#/components/schemas/FileCreateVM' + discriminator: + mapping: + ReportCreateVM: '#/components/schemas/ReportCreateVM' + ReportCreateAdminVM: '#/components/schemas/ReportCreateAdminVM' + propertyName: $t example: + $t: $t templateId: templateId properties: templateId: nullable: true pattern: "(^$)|(^[A-Fa-f0-9]{24}$)" type: string + $t: + type: string + required: + - $t type: object ReportFolderCreateVM: additionalProperties: false @@ -16715,10 +16778,16 @@ components: type: object SubscriptionVM: additionalProperties: false + discriminator: + mapping: + SubscriptionVM: '#/components/schemas/SubscriptionVM' + AdminSubscriptionVM: '#/components/schemas/AdminSubscriptionVM' + propertyName: $t example: exportsFolder: bytesUsed: 0 folderId: folderId + $t: $t current: startTime: 2000-01-23T04:56:07.000+00:00 endTime: 2000-01-23T04:56:07.000+00:00 @@ -16849,6 +16918,10 @@ components: $ref: '#/components/schemas/SubscriptionFolder' exportsFolder: $ref: '#/components/schemas/SubscriptionFolder' + $t: + type: string + required: + - $t type: object SubscriptionsVM: additionalProperties: false @@ -16858,6 +16931,7 @@ components: - exportsFolder: bytesUsed: 0 folderId: folderId + $t: $t current: startTime: 2000-01-23T04:56:07.000+00:00 endTime: 2000-01-23T04:56:07.000+00:00 @@ -16968,6 +17042,7 @@ components: - exportsFolder: bytesUsed: 0 folderId: folderId + $t: $t current: startTime: 2000-01-23T04:56:07.000+00:00 endTime: 2000-01-23T04:56:07.000+00:00 @@ -17400,6 +17475,18 @@ components: additionalProperties: false allOf: - $ref: '#/components/schemas/FileCreateVM' + discriminator: + mapping: + TemplateCreateVM: '#/components/schemas/TemplateCreateVM' + TemplateCreateAdminVM: '#/components/schemas/TemplateCreateAdminVM' + propertyName: $t + example: + $t: $t + properties: + $t: + type: string + required: + - $t type: object TemplateFolderCreateVM: additionalProperties: false diff --git a/build.gradle b/build.gradle index d876004..340f62e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'idea' apply plugin: 'eclipse' group = 'cloud.fastreport.sdk' -version = '2024.1.16' +version = '2024.1.17' buildscript { repositories { diff --git a/build.sbt b/build.sbt index 4414a4c..20cbe2d 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ lazy val root = (project in file(".")). settings( organization := "cloud.fastreport.sdk", name := "fastreport-cloud-sdk", - version := "2024.1.16", + version := "2024.1.17", scalaVersion := "2.11.4", scalacOptions ++= Seq("-feature"), javacOptions in compile ++= Seq("-Xlint:deprecation"), diff --git a/docs/AdminExportFolderCreateVM.md b/docs/AdminExportFolderCreateVM.md index 0db318e..1376c0b 100644 --- a/docs/AdminExportFolderCreateVM.md +++ b/docs/AdminExportFolderCreateVM.md @@ -7,9 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | diff --git a/docs/AdminFolderCreateVM.md b/docs/AdminFolderCreateVM.md index f81dcb1..2a53712 100644 --- a/docs/AdminFolderCreateVM.md +++ b/docs/AdminFolderCreateVM.md @@ -10,9 +10,7 @@ |**parentId** | **String** | | | |**ownerId** | **String** | | | |**force** | **Boolean** | | [optional] | -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/AdminReportFolderCreateVM.md b/docs/AdminReportFolderCreateVM.md index d4a8a84..953534f 100644 --- a/docs/AdminReportFolderCreateVM.md +++ b/docs/AdminReportFolderCreateVM.md @@ -7,9 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | diff --git a/docs/AdminSubscriptionVM.md b/docs/AdminSubscriptionVM.md index f853a88..6e278f9 100644 --- a/docs/AdminSubscriptionVM.md +++ b/docs/AdminSubscriptionVM.md @@ -9,14 +9,6 @@ |------------ | ------------- | ------------- | -------------| |**defaultPermissions** | [**DefaultPermissionsVM**](DefaultPermissionsVM.md) | | [optional] | |**ownerId** | **String** | | [optional] | -|**id** | **String** | | [optional] | -|**name** | **String** | | [optional] | -|**locale** | **String** | | [optional] | -|**current** | [**SubscriptionPeriodVM**](SubscriptionPeriodVM.md) | | [optional] | -|**old** | [**List<SubscriptionPeriodVM>**](SubscriptionPeriodVM.md) | | [optional] | -|**templatesFolder** | [**SubscriptionFolder**](SubscriptionFolder.md) | | [optional] | -|**reportsFolder** | [**SubscriptionFolder**](SubscriptionFolder.md) | | [optional] | -|**exportsFolder** | [**SubscriptionFolder**](SubscriptionFolder.md) | | [optional] | diff --git a/docs/AdminTemplateFolderCreateVM.md b/docs/AdminTemplateFolderCreateVM.md index 6b4e438..5ef3b1b 100644 --- a/docs/AdminTemplateFolderCreateVM.md +++ b/docs/AdminTemplateFolderCreateVM.md @@ -7,9 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | diff --git a/docs/CreateDataSourceAdminVM.md b/docs/CreateDataSourceAdminVM.md index 1ea725a..d3cf881 100644 --- a/docs/CreateDataSourceAdminVM.md +++ b/docs/CreateDataSourceAdminVM.md @@ -8,10 +8,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**ownerId** | **String** | | | -|**name** | **String** | | [optional] | -|**connectionString** | **String** | | | -|**subscriptionId** | **String** | | | -|**connectionType** | **DataSourceConnectionType** | | [optional] | diff --git a/docs/CreateDataSourceVM.md b/docs/CreateDataSourceVM.md index b6f98aa..72be1c0 100644 --- a/docs/CreateDataSourceVM.md +++ b/docs/CreateDataSourceVM.md @@ -11,6 +11,7 @@ |**connectionString** | **String** | | | |**subscriptionId** | **String** | | | |**connectionType** | **DataSourceConnectionType** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/CreateGroupAdminVM.md b/docs/CreateGroupAdminVM.md index 388a7f9..268f242 100644 --- a/docs/CreateGroupAdminVM.md +++ b/docs/CreateGroupAdminVM.md @@ -8,8 +8,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**ownerId** | **String** | | [optional] | -|**name** | **String** | | | -|**subscriptionId** | **String** | | [optional] | diff --git a/docs/CreateGroupVM.md b/docs/CreateGroupVM.md index ae95dd7..fcf2eed 100644 --- a/docs/CreateGroupVM.md +++ b/docs/CreateGroupVM.md @@ -9,6 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**name** | **String** | | | |**subscriptionId** | **String** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/ExportCreateAdminVM.md b/docs/ExportCreateAdminVM.md index 9f9d21f..05bd47e 100644 --- a/docs/ExportCreateAdminVM.md +++ b/docs/ExportCreateAdminVM.md @@ -9,10 +9,6 @@ |------------ | ------------- | ------------- | -------------| |**ownerId** | **String** | | | |**parentId** | **String** | | | -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | -|**content** | **byte[]** | | [optional] | diff --git a/docs/ExportCreateVM.md b/docs/ExportCreateVM.md index 8049ddb..9d61e20 100644 --- a/docs/ExportCreateVM.md +++ b/docs/ExportCreateVM.md @@ -9,10 +9,7 @@ |------------ | ------------- | ------------- | -------------| |**templateId** | **String** | | [optional] | |**reportId** | **String** | | [optional] | -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | -|**content** | **byte[]** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/ExportFolderCreateVM.md b/docs/ExportFolderCreateVM.md index 3c66736..f12e62b 100644 --- a/docs/ExportFolderCreateVM.md +++ b/docs/ExportFolderCreateVM.md @@ -7,9 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | diff --git a/docs/FileCreateVM.md b/docs/FileCreateVM.md index 19a8dd5..878bda4 100644 --- a/docs/FileCreateVM.md +++ b/docs/FileCreateVM.md @@ -11,6 +11,7 @@ |**tags** | **List<String>** | | [optional] | |**icon** | **byte[]** | | [optional] | |**content** | **byte[]** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/FileVM.md b/docs/FileVM.md index b0eeb34..56da036 100644 --- a/docs/FileVM.md +++ b/docs/FileVM.md @@ -7,6 +7,11 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| +|**id** | **String** | | [optional] | +|**createdTime** | **OffsetDateTime** | | [optional] | +|**creatorUserId** | **String** | | [optional] | +|**editedTime** | **OffsetDateTime** | | [optional] | +|**editorUserId** | **String** | | [optional] | |**name** | **String** | | [optional] | |**parentId** | **String** | | [optional] | |**tags** | **List<String>** | | [optional] | diff --git a/docs/FolderCreateVM.md b/docs/FolderCreateVM.md index 13447e8..4607dea 100644 --- a/docs/FolderCreateVM.md +++ b/docs/FolderCreateVM.md @@ -10,6 +10,7 @@ |**name** | **String** | | [optional] | |**tags** | **List<String>** | | [optional] | |**icon** | **byte[]** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/ReportCreateAdminVM.md b/docs/ReportCreateAdminVM.md index 0ad6b85..9832bfd 100644 --- a/docs/ReportCreateAdminVM.md +++ b/docs/ReportCreateAdminVM.md @@ -9,10 +9,6 @@ |------------ | ------------- | ------------- | -------------| |**ownerId** | **String** | | | |**parentId** | **String** | | | -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | -|**content** | **byte[]** | | [optional] | diff --git a/docs/ReportCreateVM.md b/docs/ReportCreateVM.md index 48320c9..eeecb1b 100644 --- a/docs/ReportCreateVM.md +++ b/docs/ReportCreateVM.md @@ -8,10 +8,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**templateId** | **String** | | [optional] | -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | -|**content** | **byte[]** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/ReportFolderCreateVM.md b/docs/ReportFolderCreateVM.md index 3743a3f..24ba48a 100644 --- a/docs/ReportFolderCreateVM.md +++ b/docs/ReportFolderCreateVM.md @@ -7,9 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | diff --git a/docs/SubscriptionVM.md b/docs/SubscriptionVM.md index b548b03..a6be379 100644 --- a/docs/SubscriptionVM.md +++ b/docs/SubscriptionVM.md @@ -15,6 +15,7 @@ |**templatesFolder** | [**SubscriptionFolder**](SubscriptionFolder.md) | | [optional] | |**reportsFolder** | [**SubscriptionFolder**](SubscriptionFolder.md) | | [optional] | |**exportsFolder** | [**SubscriptionFolder**](SubscriptionFolder.md) | | [optional] | +|**$t** | **String** | | | diff --git a/docs/TemplateCreateAdminVM.md b/docs/TemplateCreateAdminVM.md index 6dfe8f9..57a488c 100644 --- a/docs/TemplateCreateAdminVM.md +++ b/docs/TemplateCreateAdminVM.md @@ -9,10 +9,6 @@ |------------ | ------------- | ------------- | -------------| |**ownerId** | **String** | | | |**parentId** | **String** | | | -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | -|**content** | **byte[]** | | [optional] | diff --git a/docs/TemplateCreateVM.md b/docs/TemplateCreateVM.md index 95e98f8..1cd6156 100644 --- a/docs/TemplateCreateVM.md +++ b/docs/TemplateCreateVM.md @@ -7,10 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | -|**content** | **byte[]** | | [optional] | +|**$t** | **String** | | | diff --git a/docs/TemplateFolderCreateVM.md b/docs/TemplateFolderCreateVM.md index eccd09b..46f709a 100644 --- a/docs/TemplateFolderCreateVM.md +++ b/docs/TemplateFolderCreateVM.md @@ -7,9 +7,6 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**name** | **String** | | [optional] | -|**tags** | **List<String>** | | [optional] | -|**icon** | **byte[]** | | [optional] | diff --git a/pom.xml b/pom.xml index 38dec6f..35597b7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fastreport-cloud-sdk jar fastreport-cloud-sdk - 2024.1.16 + 2024.1.17 https://github.com/FastReports/FastReport-Cloud-Java FastReport Cloud SDK diff --git a/src/main/java/cloud/fastreport/client/ExportsApi.java b/src/main/java/cloud/fastreport/client/ExportsApi.java index 5e9a51f..ab21d47 100644 --- a/src/main/java/cloud/fastreport/client/ExportsApi.java +++ b/src/main/java/cloud/fastreport/client/ExportsApi.java @@ -15,6 +15,7 @@ import cloud.fastreport.model.FileTagsUpdateVM; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.FilesVM; +import cloud.fastreport.model.FolderCreateVM; import cloud.fastreport.model.FolderIconVM; import cloud.fastreport.model.FolderRenameVM; import cloud.fastreport.model.FolderSizeVM; diff --git a/src/main/java/cloud/fastreport/client/ReportsApi.java b/src/main/java/cloud/fastreport/client/ReportsApi.java index c410444..1295fe1 100644 --- a/src/main/java/cloud/fastreport/client/ReportsApi.java +++ b/src/main/java/cloud/fastreport/client/ReportsApi.java @@ -15,6 +15,7 @@ import cloud.fastreport.model.FileTagsUpdateVM; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.FilesVM; +import cloud.fastreport.model.FolderCreateVM; import cloud.fastreport.model.FolderIconVM; import cloud.fastreport.model.FolderRenameVM; import cloud.fastreport.model.FolderSizeVM; diff --git a/src/main/java/cloud/fastreport/client/TemplatesApi.java b/src/main/java/cloud/fastreport/client/TemplatesApi.java index 9cec7bb..e5cb4eb 100644 --- a/src/main/java/cloud/fastreport/client/TemplatesApi.java +++ b/src/main/java/cloud/fastreport/client/TemplatesApi.java @@ -15,6 +15,7 @@ import cloud.fastreport.model.FileTagsUpdateVM; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.FilesVM; +import cloud.fastreport.model.FolderCreateVM; import cloud.fastreport.model.FolderIconVM; import cloud.fastreport.model.FolderRenameVM; import cloud.fastreport.model.FolderSizeVM; diff --git a/src/main/java/cloud/fastreport/model/AdminExportFolderCreateVM.java b/src/main/java/cloud/fastreport/model/AdminExportFolderCreateVM.java index acc43b9..4264bfc 100644 --- a/src/main/java/cloud/fastreport/model/AdminExportFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/AdminExportFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.AdminFolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,135 +35,40 @@ * AdminExportFolderCreateVM */ @JsonPropertyOrder({ - AdminExportFolderCreateVM.JSON_PROPERTY_NAME, - AdminExportFolderCreateVM.JSON_PROPERTY_TAGS, - AdminExportFolderCreateVM.JSON_PROPERTY_ICON }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class AdminExportFolderCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +public class AdminExportFolderCreateVM extends AdminFolderCreateVM { public AdminExportFolderCreateVM() { - } + } + @Override public AdminExportFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public AdminExportFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - - return this; - } - - public AdminExportFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public AdminExportFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); + @Override + public AdminExportFolderCreateVM $t(String $t) { + this.set$T($t); + return this; } @Override @@ -173,10 +79,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AdminExportFolderCreateVM adminExportFolderCreateVM = (AdminExportFolderCreateVM) o; - return equalsNullable(this.name, adminExportFolderCreateVM.name) && - equalsNullable(this.tags, adminExportFolderCreateVM.tags) && - equalsNullable(this.icon, adminExportFolderCreateVM.icon); + return super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +88,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -199,9 +102,7 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdminExportFolderCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/AdminFolderCreateVM.java b/src/main/java/cloud/fastreport/model/AdminFolderCreateVM.java index 4820ee9..a8b1f59 100644 --- a/src/main/java/cloud/fastreport/model/AdminFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/AdminFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -37,12 +38,22 @@ AdminFolderCreateVM.JSON_PROPERTY_PARENT_ID, AdminFolderCreateVM.JSON_PROPERTY_OWNER_ID, AdminFolderCreateVM.JSON_PROPERTY_FORCE, - AdminFolderCreateVM.JSON_PROPERTY_NAME, - AdminFolderCreateVM.JSON_PROPERTY_TAGS, - AdminFolderCreateVM.JSON_PROPERTY_ICON + AdminFolderCreateVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class AdminFolderCreateVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = AdminExportFolderCreateVM.class, name = "AdminExportFolderCreateVM"), + @JsonSubTypes.Type(value = AdminFolderCreateVM.class, name = "AdminFolderCreateVM"), + @JsonSubTypes.Type(value = AdminReportFolderCreateVM.class, name = "AdminReportFolderCreateVM"), + @JsonSubTypes.Type(value = AdminTemplateFolderCreateVM.class, name = "AdminTemplateFolderCreateVM"), +}) + +public class AdminFolderCreateVM extends FolderCreateVM { public static final String JSON_PROPERTY_PARENT_ID = "parentId"; private String parentId; @@ -52,16 +63,11 @@ public class AdminFolderCreateVM { public static final String JSON_PROPERTY_FORCE = "force"; private Boolean force; - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; public AdminFolderCreateVM() { + } public AdminFolderCreateVM parentId(String parentId) { @@ -142,119 +148,49 @@ public void setForce(Boolean force) { } - public AdminFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); + public AdminFolderCreateVM $t(String $t) { + this.$t = $t; return this; } /** - * Get name - * @return name + * Get $t + * @return $t **/ - @javax.annotation.Nullable - @JsonIgnore + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) - public String getName() { - return name.orElse(null); + public String get$T() { + return $t; } - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - public void setName(String name) { - this.name = JsonNullable.of(name); + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; } - - public AdminFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + @Override + public AdminFolderCreateVM name(String name) { + this.setName(name); return this; } - public AdminFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + @Override + public AdminFolderCreateVM tags(List tags) { + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public AdminFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -267,9 +203,8 @@ public boolean equals(Object o) { return Objects.equals(this.parentId, adminFolderCreateVM.parentId) && Objects.equals(this.ownerId, adminFolderCreateVM.ownerId) && Objects.equals(this.force, adminFolderCreateVM.force) && - equalsNullable(this.name, adminFolderCreateVM.name) && - equalsNullable(this.tags, adminFolderCreateVM.tags) && - equalsNullable(this.icon, adminFolderCreateVM.icon); + Objects.equals(this.$t, adminFolderCreateVM.$t) && + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -278,7 +213,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(parentId, ownerId, force, hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(parentId, ownerId, force, $t, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -292,12 +227,11 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdminFolderCreateVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" parentId: ").append(toIndentedString(parentId)).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); sb.append(" force: ").append(toIndentedString(force)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/AdminReportFolderCreateVM.java b/src/main/java/cloud/fastreport/model/AdminReportFolderCreateVM.java index 76e8bed..32fdd6a 100644 --- a/src/main/java/cloud/fastreport/model/AdminReportFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/AdminReportFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.AdminFolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,137 +35,36 @@ * AdminReportFolderCreateVM */ @JsonPropertyOrder({ - AdminReportFolderCreateVM.JSON_PROPERTY_NAME, - AdminReportFolderCreateVM.JSON_PROPERTY_TAGS, - AdminReportFolderCreateVM.JSON_PROPERTY_ICON }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class AdminReportFolderCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +public class AdminReportFolderCreateVM extends AdminFolderCreateVM { public AdminReportFolderCreateVM() { - } + } + @Override public AdminReportFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public AdminReportFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - - return this; - } - - public AdminReportFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public AdminReportFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -173,10 +73,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AdminReportFolderCreateVM adminReportFolderCreateVM = (AdminReportFolderCreateVM) o; - return equalsNullable(this.name, adminReportFolderCreateVM.name) && - equalsNullable(this.tags, adminReportFolderCreateVM.tags) && - equalsNullable(this.icon, adminReportFolderCreateVM.icon); + return super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +82,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -199,9 +96,7 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdminReportFolderCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/AdminSubscriptionVM.java b/src/main/java/cloud/fastreport/model/AdminSubscriptionVM.java index b6f4086..7e737a1 100644 --- a/src/main/java/cloud/fastreport/model/AdminSubscriptionVM.java +++ b/src/main/java/cloud/fastreport/model/AdminSubscriptionVM.java @@ -18,9 +18,13 @@ import cloud.fastreport.model.DefaultPermissionsVM; import cloud.fastreport.model.SubscriptionFolder; import cloud.fastreport.model.SubscriptionPeriodVM; +import cloud.fastreport.model.SubscriptionVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -38,49 +42,24 @@ */ @JsonPropertyOrder({ AdminSubscriptionVM.JSON_PROPERTY_DEFAULT_PERMISSIONS, - AdminSubscriptionVM.JSON_PROPERTY_OWNER_ID, - AdminSubscriptionVM.JSON_PROPERTY_ID, - AdminSubscriptionVM.JSON_PROPERTY_NAME, - AdminSubscriptionVM.JSON_PROPERTY_LOCALE, - AdminSubscriptionVM.JSON_PROPERTY_CURRENT, - AdminSubscriptionVM.JSON_PROPERTY_OLD, - AdminSubscriptionVM.JSON_PROPERTY_TEMPLATES_FOLDER, - AdminSubscriptionVM.JSON_PROPERTY_REPORTS_FOLDER, - AdminSubscriptionVM.JSON_PROPERTY_EXPORTS_FOLDER + AdminSubscriptionVM.JSON_PROPERTY_OWNER_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class AdminSubscriptionVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) + +public class AdminSubscriptionVM extends SubscriptionVM { public static final String JSON_PROPERTY_DEFAULT_PERMISSIONS = "defaultPermissions"; private DefaultPermissionsVM defaultPermissions; public static final String JSON_PROPERTY_OWNER_ID = "ownerId"; private JsonNullable ownerId = JsonNullable.undefined(); - public static final String JSON_PROPERTY_ID = "id"; - private JsonNullable id = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_LOCALE = "locale"; - private JsonNullable locale = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CURRENT = "current"; - private SubscriptionPeriodVM current; - - public static final String JSON_PROPERTY_OLD = "old"; - private JsonNullable> old = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_TEMPLATES_FOLDER = "templatesFolder"; - private SubscriptionFolder templatesFolder; - - public static final String JSON_PROPERTY_REPORTS_FOLDER = "reportsFolder"; - private SubscriptionFolder reportsFolder; - - public static final String JSON_PROPERTY_EXPORTS_FOLDER = "exportsFolder"; - private SubscriptionFolder exportsFolder; - public AdminSubscriptionVM() { + } public AdminSubscriptionVM defaultPermissions(DefaultPermissionsVM defaultPermissions) { @@ -142,258 +121,54 @@ public void setOwnerId(String ownerId) { this.ownerId = JsonNullable.of(ownerId); } - + @Override public AdminSubscriptionVM id(String id) { - this.id = JsonNullable.of(id); - + this.setId(id); return this; } - /** - * Get id - * @return id - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getId() { - return id.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getId_JsonNullable() { - return id; - } - - @JsonProperty(JSON_PROPERTY_ID) - public void setId_JsonNullable(JsonNullable id) { - this.id = id; - } - - public void setId(String id) { - this.id = JsonNullable.of(id); - } - - + @Override public AdminSubscriptionVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public AdminSubscriptionVM locale(String locale) { - this.locale = JsonNullable.of(locale); - + this.setLocale(locale); return this; } - /** - * Get locale - * @return locale - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getLocale() { - return locale.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_LOCALE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getLocale_JsonNullable() { - return locale; - } - - @JsonProperty(JSON_PROPERTY_LOCALE) - public void setLocale_JsonNullable(JsonNullable locale) { - this.locale = locale; - } - - public void setLocale(String locale) { - this.locale = JsonNullable.of(locale); - } - - + @Override public AdminSubscriptionVM current(SubscriptionPeriodVM current) { - - this.current = current; + this.setCurrent(current); return this; } - /** - * Get current - * @return current - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_CURRENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SubscriptionPeriodVM getCurrent() { - return current; - } - - - @JsonProperty(JSON_PROPERTY_CURRENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setCurrent(SubscriptionPeriodVM current) { - this.current = current; - } - - + @Override public AdminSubscriptionVM old(List old) { - this.old = JsonNullable.>of(old); - + this.setOld(old); return this; } - public AdminSubscriptionVM addOldItem(SubscriptionPeriodVM oldItem) { - if (this.old == null || !this.old.isPresent()) { - this.old = JsonNullable.>of(new ArrayList<>()); - } - try { - this.old.get().add(oldItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } - return this; - } - - /** - * Get old - * @return old - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getOld() { - return old.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_OLD) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getOld_JsonNullable() { - return old; - } - - @JsonProperty(JSON_PROPERTY_OLD) - public void setOld_JsonNullable(JsonNullable> old) { - this.old = old; - } - - public void setOld(List old) { - this.old = JsonNullable.>of(old); - } - - + @Override public AdminSubscriptionVM templatesFolder(SubscriptionFolder templatesFolder) { - - this.templatesFolder = templatesFolder; + this.setTemplatesFolder(templatesFolder); return this; } - /** - * Get templatesFolder - * @return templatesFolder - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_TEMPLATES_FOLDER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SubscriptionFolder getTemplatesFolder() { - return templatesFolder; - } - - - @JsonProperty(JSON_PROPERTY_TEMPLATES_FOLDER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setTemplatesFolder(SubscriptionFolder templatesFolder) { - this.templatesFolder = templatesFolder; - } - - + @Override public AdminSubscriptionVM reportsFolder(SubscriptionFolder reportsFolder) { - - this.reportsFolder = reportsFolder; + this.setReportsFolder(reportsFolder); return this; } - /** - * Get reportsFolder - * @return reportsFolder - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_REPORTS_FOLDER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SubscriptionFolder getReportsFolder() { - return reportsFolder; - } - - - @JsonProperty(JSON_PROPERTY_REPORTS_FOLDER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setReportsFolder(SubscriptionFolder reportsFolder) { - this.reportsFolder = reportsFolder; - } - - + @Override public AdminSubscriptionVM exportsFolder(SubscriptionFolder exportsFolder) { - - this.exportsFolder = exportsFolder; + this.setExportsFolder(exportsFolder); return this; } - /** - * Get exportsFolder - * @return exportsFolder - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_EXPORTS_FOLDER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public SubscriptionFolder getExportsFolder() { - return exportsFolder; - } - - - @JsonProperty(JSON_PROPERTY_EXPORTS_FOLDER) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setExportsFolder(SubscriptionFolder exportsFolder) { - this.exportsFolder = exportsFolder; - } - @Override public boolean equals(Object o) { if (this == o) { @@ -405,14 +180,7 @@ public boolean equals(Object o) { AdminSubscriptionVM adminSubscriptionVM = (AdminSubscriptionVM) o; return Objects.equals(this.defaultPermissions, adminSubscriptionVM.defaultPermissions) && equalsNullable(this.ownerId, adminSubscriptionVM.ownerId) && - equalsNullable(this.id, adminSubscriptionVM.id) && - equalsNullable(this.name, adminSubscriptionVM.name) && - equalsNullable(this.locale, adminSubscriptionVM.locale) && - Objects.equals(this.current, adminSubscriptionVM.current) && - equalsNullable(this.old, adminSubscriptionVM.old) && - Objects.equals(this.templatesFolder, adminSubscriptionVM.templatesFolder) && - Objects.equals(this.reportsFolder, adminSubscriptionVM.reportsFolder) && - Objects.equals(this.exportsFolder, adminSubscriptionVM.exportsFolder); + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -421,7 +189,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(defaultPermissions, hashCodeNullable(ownerId), hashCodeNullable(id), hashCodeNullable(name), hashCodeNullable(locale), current, hashCodeNullable(old), templatesFolder, reportsFolder, exportsFolder); + return Objects.hash(defaultPermissions, hashCodeNullable(ownerId), super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -435,16 +203,9 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdminSubscriptionVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" defaultPermissions: ").append(toIndentedString(defaultPermissions)).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" locale: ").append(toIndentedString(locale)).append("\n"); - sb.append(" current: ").append(toIndentedString(current)).append("\n"); - sb.append(" old: ").append(toIndentedString(old)).append("\n"); - sb.append(" templatesFolder: ").append(toIndentedString(templatesFolder)).append("\n"); - sb.append(" reportsFolder: ").append(toIndentedString(reportsFolder)).append("\n"); - sb.append(" exportsFolder: ").append(toIndentedString(exportsFolder)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/AdminTemplateFolderCreateVM.java b/src/main/java/cloud/fastreport/model/AdminTemplateFolderCreateVM.java index 990766a..e567f44 100644 --- a/src/main/java/cloud/fastreport/model/AdminTemplateFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/AdminTemplateFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.AdminFolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,137 +35,36 @@ * AdminTemplateFolderCreateVM */ @JsonPropertyOrder({ - AdminTemplateFolderCreateVM.JSON_PROPERTY_NAME, - AdminTemplateFolderCreateVM.JSON_PROPERTY_TAGS, - AdminTemplateFolderCreateVM.JSON_PROPERTY_ICON }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class AdminTemplateFolderCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +public class AdminTemplateFolderCreateVM extends AdminFolderCreateVM { public AdminTemplateFolderCreateVM() { - } + } + @Override public AdminTemplateFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public AdminTemplateFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - - return this; - } - - public AdminTemplateFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public AdminTemplateFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -173,10 +73,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - AdminTemplateFolderCreateVM adminTemplateFolderCreateVM = (AdminTemplateFolderCreateVM) o; - return equalsNullable(this.name, adminTemplateFolderCreateVM.name) && - equalsNullable(this.tags, adminTemplateFolderCreateVM.tags) && - equalsNullable(this.icon, adminTemplateFolderCreateVM.icon); + return super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +82,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -199,9 +96,7 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class AdminTemplateFolderCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/AuditFilePropertyChangedVM.java b/src/main/java/cloud/fastreport/model/AuditFilePropertyChangedVM.java index 2e51a02..f14035f 100644 --- a/src/main/java/cloud/fastreport/model/AuditFilePropertyChangedVM.java +++ b/src/main/java/cloud/fastreport/model/AuditFilePropertyChangedVM.java @@ -218,6 +218,12 @@ public AuditFilePropertyChangedVM type(AuditType type) { return this; } + @Override + public AuditFilePropertyChangedVM id(String id) { + this.setId(id); + return this; + } + @Override public AuditFilePropertyChangedVM createdTime(OffsetDateTime createdTime) { this.setCreatedTime(createdTime); @@ -231,14 +237,14 @@ public AuditFilePropertyChangedVM creatorUserId(String creatorUserId) { } @Override - public AuditFilePropertyChangedVM adminAction(Boolean adminAction) { - this.setAdminAction(adminAction); + public AuditFilePropertyChangedVM name(String name) { + this.setName(name); return this; } @Override - public AuditFilePropertyChangedVM $t(String $t) { - this.set$T($t); + public AuditFilePropertyChangedVM adminAction(Boolean adminAction) { + this.setAdminAction(adminAction); return this; } diff --git a/src/main/java/cloud/fastreport/model/AuditSubscriptionActionVM.java b/src/main/java/cloud/fastreport/model/AuditSubscriptionActionVM.java index 9ad0e75..9d3fe1b 100644 --- a/src/main/java/cloud/fastreport/model/AuditSubscriptionActionVM.java +++ b/src/main/java/cloud/fastreport/model/AuditSubscriptionActionVM.java @@ -171,6 +171,12 @@ public AuditSubscriptionActionVM type(AuditType type) { return this; } + @Override + public AuditSubscriptionActionVM id(String id) { + this.setId(id); + return this; + } + @Override public AuditSubscriptionActionVM createdTime(OffsetDateTime createdTime) { this.setCreatedTime(createdTime); @@ -184,14 +190,14 @@ public AuditSubscriptionActionVM creatorUserId(String creatorUserId) { } @Override - public AuditSubscriptionActionVM adminAction(Boolean adminAction) { - this.setAdminAction(adminAction); + public AuditSubscriptionActionVM name(String name) { + this.setName(name); return this; } @Override - public AuditSubscriptionActionVM $t(String $t) { - this.set$T($t); + public AuditSubscriptionActionVM adminAction(Boolean adminAction) { + this.setAdminAction(adminAction); return this; } diff --git a/src/main/java/cloud/fastreport/model/AuditTaskActionVM.java b/src/main/java/cloud/fastreport/model/AuditTaskActionVM.java index bf1e2ea..54ad4de 100644 --- a/src/main/java/cloud/fastreport/model/AuditTaskActionVM.java +++ b/src/main/java/cloud/fastreport/model/AuditTaskActionVM.java @@ -149,6 +149,12 @@ public AuditTaskActionVM type(AuditType type) { return this; } + @Override + public AuditTaskActionVM id(String id) { + this.setId(id); + return this; + } + @Override public AuditTaskActionVM createdTime(OffsetDateTime createdTime) { this.setCreatedTime(createdTime); @@ -162,14 +168,14 @@ public AuditTaskActionVM creatorUserId(String creatorUserId) { } @Override - public AuditTaskActionVM adminAction(Boolean adminAction) { - this.setAdminAction(adminAction); + public AuditTaskActionVM name(String name) { + this.setName(name); return this; } @Override - public AuditTaskActionVM $t(String $t) { - this.set$T($t); + public AuditTaskActionVM adminAction(Boolean adminAction) { + this.setAdminAction(adminAction); return this; } diff --git a/src/main/java/cloud/fastreport/model/CreateDataSourceAdminVM.java b/src/main/java/cloud/fastreport/model/CreateDataSourceAdminVM.java index 5b14bde..a09856c 100644 --- a/src/main/java/cloud/fastreport/model/CreateDataSourceAdminVM.java +++ b/src/main/java/cloud/fastreport/model/CreateDataSourceAdminVM.java @@ -15,16 +15,17 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.CreateDataSourceVM; import cloud.fastreport.model.DataSourceConnectionType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -32,30 +33,21 @@ * CreateDataSourceAdminVM */ @JsonPropertyOrder({ - CreateDataSourceAdminVM.JSON_PROPERTY_OWNER_ID, - CreateDataSourceAdminVM.JSON_PROPERTY_NAME, - CreateDataSourceAdminVM.JSON_PROPERTY_CONNECTION_STRING, - CreateDataSourceAdminVM.JSON_PROPERTY_SUBSCRIPTION_ID, - CreateDataSourceAdminVM.JSON_PROPERTY_CONNECTION_TYPE + CreateDataSourceAdminVM.JSON_PROPERTY_OWNER_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class CreateDataSourceAdminVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) + +public class CreateDataSourceAdminVM extends CreateDataSourceVM { public static final String JSON_PROPERTY_OWNER_ID = "ownerId"; private String ownerId; - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CONNECTION_STRING = "connectionString"; - private String connectionString; - - public static final String JSON_PROPERTY_SUBSCRIPTION_ID = "subscriptionId"; - private String subscriptionId; - - public static final String JSON_PROPERTY_CONNECTION_TYPE = "connectionType"; - private DataSourceConnectionType connectionType; - public CreateDataSourceAdminVM() { + } public CreateDataSourceAdminVM ownerId(String ownerId) { @@ -83,118 +75,30 @@ public void setOwnerId(String ownerId) { this.ownerId = ownerId; } - + @Override public CreateDataSourceAdminVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public CreateDataSourceAdminVM connectionString(String connectionString) { - - this.connectionString = connectionString; + this.setConnectionString(connectionString); return this; } - /** - * Get connectionString - * @return connectionString - **/ - @javax.annotation.Nonnull - @JsonProperty(JSON_PROPERTY_CONNECTION_STRING) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - - public String getConnectionString() { - return connectionString; - } - - - @JsonProperty(JSON_PROPERTY_CONNECTION_STRING) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setConnectionString(String connectionString) { - this.connectionString = connectionString; - } - - + @Override public CreateDataSourceAdminVM subscriptionId(String subscriptionId) { - - this.subscriptionId = subscriptionId; + this.setSubscriptionId(subscriptionId); return this; } - /** - * Get subscriptionId - * @return subscriptionId - **/ - @javax.annotation.Nonnull - @JsonProperty(JSON_PROPERTY_SUBSCRIPTION_ID) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - - public String getSubscriptionId() { - return subscriptionId; - } - - - @JsonProperty(JSON_PROPERTY_SUBSCRIPTION_ID) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setSubscriptionId(String subscriptionId) { - this.subscriptionId = subscriptionId; - } - - + @Override public CreateDataSourceAdminVM connectionType(DataSourceConnectionType connectionType) { - - this.connectionType = connectionType; + this.setConnectionType(connectionType); return this; } - /** - * Get connectionType - * @return connectionType - **/ - @javax.annotation.Nullable - @JsonProperty(JSON_PROPERTY_CONNECTION_TYPE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public DataSourceConnectionType getConnectionType() { - return connectionType; - } - - - @JsonProperty(JSON_PROPERTY_CONNECTION_TYPE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setConnectionType(DataSourceConnectionType connectionType) { - this.connectionType = connectionType; - } - @Override public boolean equals(Object o) { if (this == o) { @@ -205,10 +109,7 @@ public boolean equals(Object o) { } CreateDataSourceAdminVM createDataSourceAdminVM = (CreateDataSourceAdminVM) o; return Objects.equals(this.ownerId, createDataSourceAdminVM.ownerId) && - equalsNullable(this.name, createDataSourceAdminVM.name) && - Objects.equals(this.connectionString, createDataSourceAdminVM.connectionString) && - Objects.equals(this.subscriptionId, createDataSourceAdminVM.subscriptionId) && - Objects.equals(this.connectionType, createDataSourceAdminVM.connectionType); + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -217,7 +118,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(ownerId, hashCodeNullable(name), connectionString, subscriptionId, connectionType); + return Objects.hash(ownerId, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -231,11 +132,8 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class CreateDataSourceAdminVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" connectionString: ").append(toIndentedString(connectionString)).append("\n"); - sb.append(" subscriptionId: ").append(toIndentedString(subscriptionId)).append("\n"); - sb.append(" connectionType: ").append(toIndentedString(connectionType)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/CreateDataSourceVM.java b/src/main/java/cloud/fastreport/model/CreateDataSourceVM.java index dde8860..a1c989a 100644 --- a/src/main/java/cloud/fastreport/model/CreateDataSourceVM.java +++ b/src/main/java/cloud/fastreport/model/CreateDataSourceVM.java @@ -16,9 +16,12 @@ import java.util.Objects; import java.util.Arrays; import cloud.fastreport.model.DataSourceConnectionType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; @@ -35,9 +38,20 @@ CreateDataSourceVM.JSON_PROPERTY_NAME, CreateDataSourceVM.JSON_PROPERTY_CONNECTION_STRING, CreateDataSourceVM.JSON_PROPERTY_SUBSCRIPTION_ID, - CreateDataSourceVM.JSON_PROPERTY_CONNECTION_TYPE + CreateDataSourceVM.JSON_PROPERTY_CONNECTION_TYPE, + CreateDataSourceVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = CreateDataSourceAdminVM.class, name = "CreateDataSourceAdminVM"), + @JsonSubTypes.Type(value = CreateDataSourceVM.class, name = "CreateDataSourceVM"), +}) + public class CreateDataSourceVM { public static final String JSON_PROPERTY_NAME = "name"; private JsonNullable name = JsonNullable.undefined(); @@ -51,6 +65,9 @@ public class CreateDataSourceVM { public static final String JSON_PROPERTY_CONNECTION_TYPE = "connectionType"; private DataSourceConnectionType connectionType; + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; + public CreateDataSourceVM() { } @@ -165,6 +182,32 @@ public void setConnectionType(DataSourceConnectionType connectionType) { this.connectionType = connectionType; } + + public CreateDataSourceVM $t(String $t) { + + this.$t = $t; + return this; + } + + /** + * Get $t + * @return $t + **/ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String get$T() { + return $t; + } + + + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -177,7 +220,8 @@ public boolean equals(Object o) { return equalsNullable(this.name, createDataSourceVM.name) && Objects.equals(this.connectionString, createDataSourceVM.connectionString) && Objects.equals(this.subscriptionId, createDataSourceVM.subscriptionId) && - Objects.equals(this.connectionType, createDataSourceVM.connectionType); + Objects.equals(this.connectionType, createDataSourceVM.connectionType) && + Objects.equals(this.$t, createDataSourceVM.$t); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -186,7 +230,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), connectionString, subscriptionId, connectionType); + return Objects.hash(hashCodeNullable(name), connectionString, subscriptionId, connectionType, $t); } private static int hashCodeNullable(JsonNullable a) { @@ -204,6 +248,7 @@ public String toString() { sb.append(" connectionString: ").append(toIndentedString(connectionString)).append("\n"); sb.append(" subscriptionId: ").append(toIndentedString(subscriptionId)).append("\n"); sb.append(" connectionType: ").append(toIndentedString(connectionType)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/CreateEmailTaskVM.java b/src/main/java/cloud/fastreport/model/CreateEmailTaskVM.java index 63c27f6..c40df0d 100644 --- a/src/main/java/cloud/fastreport/model/CreateEmailTaskVM.java +++ b/src/main/java/cloud/fastreport/model/CreateEmailTaskVM.java @@ -445,12 +445,6 @@ public CreateEmailTaskVM subscriptionId(String subscriptionId) { return this; } - @Override - public CreateEmailTaskVM $t(String $t) { - this.set$T($t); - return this; - } - @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/cloud/fastreport/model/CreateGroupAdminVM.java b/src/main/java/cloud/fastreport/model/CreateGroupAdminVM.java index 59ca761..114de05 100644 --- a/src/main/java/cloud/fastreport/model/CreateGroupAdminVM.java +++ b/src/main/java/cloud/fastreport/model/CreateGroupAdminVM.java @@ -15,9 +15,13 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.CreateGroupVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; @@ -31,22 +35,21 @@ * CreateGroupAdminVM */ @JsonPropertyOrder({ - CreateGroupAdminVM.JSON_PROPERTY_OWNER_ID, - CreateGroupAdminVM.JSON_PROPERTY_NAME, - CreateGroupAdminVM.JSON_PROPERTY_SUBSCRIPTION_ID + CreateGroupAdminVM.JSON_PROPERTY_OWNER_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class CreateGroupAdminVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) + +public class CreateGroupAdminVM extends CreateGroupVM { public static final String JSON_PROPERTY_OWNER_ID = "ownerId"; private JsonNullable ownerId = JsonNullable.undefined(); - public static final String JSON_PROPERTY_NAME = "name"; - private String name; - - public static final String JSON_PROPERTY_SUBSCRIPTION_ID = "subscriptionId"; - private JsonNullable subscriptionId = JsonNullable.undefined(); - public CreateGroupAdminVM() { + } public CreateGroupAdminVM ownerId(String ownerId) { @@ -82,66 +85,18 @@ public void setOwnerId(String ownerId) { this.ownerId = JsonNullable.of(ownerId); } - + @Override public CreateGroupAdminVM name(String name) { - - this.name = name; + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nonnull - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - - public String getName() { - return name; - } - - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setName(String name) { - this.name = name; - } - - + @Override public CreateGroupAdminVM subscriptionId(String subscriptionId) { - this.subscriptionId = JsonNullable.of(subscriptionId); - + this.setSubscriptionId(subscriptionId); return this; } - /** - * Get subscriptionId - * @return subscriptionId - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getSubscriptionId() { - return subscriptionId.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_SUBSCRIPTION_ID) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getSubscriptionId_JsonNullable() { - return subscriptionId; - } - - @JsonProperty(JSON_PROPERTY_SUBSCRIPTION_ID) - public void setSubscriptionId_JsonNullable(JsonNullable subscriptionId) { - this.subscriptionId = subscriptionId; - } - - public void setSubscriptionId(String subscriptionId) { - this.subscriptionId = JsonNullable.of(subscriptionId); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -152,8 +107,7 @@ public boolean equals(Object o) { } CreateGroupAdminVM createGroupAdminVM = (CreateGroupAdminVM) o; return equalsNullable(this.ownerId, createGroupAdminVM.ownerId) && - Objects.equals(this.name, createGroupAdminVM.name) && - equalsNullable(this.subscriptionId, createGroupAdminVM.subscriptionId); + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -162,7 +116,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(ownerId), name, hashCodeNullable(subscriptionId)); + return Objects.hash(hashCodeNullable(ownerId), super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -176,9 +130,8 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class CreateGroupAdminVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" subscriptionId: ").append(toIndentedString(subscriptionId)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/CreateGroupVM.java b/src/main/java/cloud/fastreport/model/CreateGroupVM.java index 90a828c..13de373 100644 --- a/src/main/java/cloud/fastreport/model/CreateGroupVM.java +++ b/src/main/java/cloud/fastreport/model/CreateGroupVM.java @@ -15,9 +15,12 @@ import java.util.Objects; import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; @@ -32,9 +35,20 @@ */ @JsonPropertyOrder({ CreateGroupVM.JSON_PROPERTY_NAME, - CreateGroupVM.JSON_PROPERTY_SUBSCRIPTION_ID + CreateGroupVM.JSON_PROPERTY_SUBSCRIPTION_ID, + CreateGroupVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = CreateGroupAdminVM.class, name = "CreateGroupAdminVM"), + @JsonSubTypes.Type(value = CreateGroupVM.class, name = "CreateGroupVM"), +}) + public class CreateGroupVM { public static final String JSON_PROPERTY_NAME = "name"; private String name; @@ -42,6 +56,9 @@ public class CreateGroupVM { public static final String JSON_PROPERTY_SUBSCRIPTION_ID = "subscriptionId"; private JsonNullable subscriptionId = JsonNullable.undefined(); + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; + public CreateGroupVM() { } @@ -104,6 +121,32 @@ public void setSubscriptionId(String subscriptionId) { this.subscriptionId = JsonNullable.of(subscriptionId); } + + public CreateGroupVM $t(String $t) { + + this.$t = $t; + return this; + } + + /** + * Get $t + * @return $t + **/ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String get$T() { + return $t; + } + + + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -114,7 +157,8 @@ public boolean equals(Object o) { } CreateGroupVM createGroupVM = (CreateGroupVM) o; return Objects.equals(this.name, createGroupVM.name) && - equalsNullable(this.subscriptionId, createGroupVM.subscriptionId); + equalsNullable(this.subscriptionId, createGroupVM.subscriptionId) && + Objects.equals(this.$t, createGroupVM.$t); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -123,7 +167,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(name, hashCodeNullable(subscriptionId)); + return Objects.hash(name, hashCodeNullable(subscriptionId), $t); } private static int hashCodeNullable(JsonNullable a) { @@ -139,6 +183,7 @@ public String toString() { sb.append("class CreateGroupVM {\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" subscriptionId: ").append(toIndentedString(subscriptionId)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ExportCreateAdminVM.java b/src/main/java/cloud/fastreport/model/ExportCreateAdminVM.java index cd35345..4507999 100644 --- a/src/main/java/cloud/fastreport/model/ExportCreateAdminVM.java +++ b/src/main/java/cloud/fastreport/model/ExportCreateAdminVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.ExportCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -35,33 +36,24 @@ */ @JsonPropertyOrder({ ExportCreateAdminVM.JSON_PROPERTY_OWNER_ID, - ExportCreateAdminVM.JSON_PROPERTY_PARENT_ID, - ExportCreateAdminVM.JSON_PROPERTY_NAME, - ExportCreateAdminVM.JSON_PROPERTY_TAGS, - ExportCreateAdminVM.JSON_PROPERTY_ICON, - ExportCreateAdminVM.JSON_PROPERTY_CONTENT + ExportCreateAdminVM.JSON_PROPERTY_PARENT_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class ExportCreateAdminVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) + +public class ExportCreateAdminVM extends ExportCreateVM { public static final String JSON_PROPERTY_OWNER_ID = "ownerId"; private String ownerId; public static final String JSON_PROPERTY_PARENT_ID = "parentId"; private String parentId; - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CONTENT = "content"; - private JsonNullable content = JsonNullable.undefined(); - public ExportCreateAdminVM() { + } public ExportCreateAdminVM ownerId(String ownerId) { @@ -115,154 +107,30 @@ public void setParentId(String parentId) { this.parentId = parentId; } - + @Override public ExportCreateAdminVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public ExportCreateAdminVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + this.setTags(tags); return this; } - public ExportCreateAdminVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } - return this; - } - - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public ExportCreateAdminVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - - + @Override public ExportCreateAdminVM content(byte[] content) { - this.content = JsonNullable.of(content); - + this.setContent(content); return this; } - /** - * Get content - * @return content - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getContent() { - return content.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getContent_JsonNullable() { - return content; - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - public void setContent_JsonNullable(JsonNullable content) { - this.content = content; - } - - public void setContent(byte[] content) { - this.content = JsonNullable.of(content); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -274,10 +142,7 @@ public boolean equals(Object o) { ExportCreateAdminVM exportCreateAdminVM = (ExportCreateAdminVM) o; return Objects.equals(this.ownerId, exportCreateAdminVM.ownerId) && Objects.equals(this.parentId, exportCreateAdminVM.parentId) && - equalsNullable(this.name, exportCreateAdminVM.name) && - equalsNullable(this.tags, exportCreateAdminVM.tags) && - equalsNullable(this.icon, exportCreateAdminVM.icon) && - equalsNullable(this.content, exportCreateAdminVM.content); + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -286,7 +151,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(ownerId, parentId, hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash(ownerId, parentId, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -300,12 +165,9 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ExportCreateAdminVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); sb.append(" parentId: ").append(toIndentedString(parentId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); - sb.append(" content: ").append(toIndentedString(content)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ExportCreateVM.java b/src/main/java/cloud/fastreport/model/ExportCreateVM.java index c270d42..4e79d0b 100644 --- a/src/main/java/cloud/fastreport/model/ExportCreateVM.java +++ b/src/main/java/cloud/fastreport/model/ExportCreateVM.java @@ -15,9 +15,13 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FileCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -36,32 +40,31 @@ @JsonPropertyOrder({ ExportCreateVM.JSON_PROPERTY_TEMPLATE_ID, ExportCreateVM.JSON_PROPERTY_REPORT_ID, - ExportCreateVM.JSON_PROPERTY_NAME, - ExportCreateVM.JSON_PROPERTY_TAGS, - ExportCreateVM.JSON_PROPERTY_ICON, - ExportCreateVM.JSON_PROPERTY_CONTENT + ExportCreateVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class ExportCreateVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = ExportCreateAdminVM.class, name = "ExportCreateAdminVM"), + @JsonSubTypes.Type(value = ExportCreateVM.class, name = "ExportCreateVM"), +}) + +public class ExportCreateVM extends FileCreateVM { public static final String JSON_PROPERTY_TEMPLATE_ID = "templateId"; private JsonNullable templateId = JsonNullable.undefined(); public static final String JSON_PROPERTY_REPORT_ID = "reportId"; private JsonNullable reportId = JsonNullable.undefined(); - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CONTENT = "content"; - private JsonNullable content = JsonNullable.undefined(); + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; public ExportCreateVM() { + } public ExportCreateVM templateId(String templateId) { @@ -132,153 +135,55 @@ public void setReportId(String reportId) { } - public ExportCreateVM name(String name) { - this.name = JsonNullable.of(name); + public ExportCreateVM $t(String $t) { + this.$t = $t; return this; } /** - * Get name - * @return name + * Get $t + * @return $t **/ - @javax.annotation.Nullable - @JsonIgnore + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) - public String getName() { - return name.orElse(null); + public String get$T() { + return $t; } - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public JsonNullable getName_JsonNullable() { - return name; + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - public ExportCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + @Override + public ExportCreateVM name(String name) { + this.setName(name); return this; } - public ExportCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + @Override + public ExportCreateVM tags(List tags) { + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public ExportCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - - + @Override public ExportCreateVM content(byte[] content) { - this.content = JsonNullable.of(content); - + this.setContent(content); return this; } - /** - * Get content - * @return content - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getContent() { - return content.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getContent_JsonNullable() { - return content; - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - public void setContent_JsonNullable(JsonNullable content) { - this.content = content; - } - - public void setContent(byte[] content) { - this.content = JsonNullable.of(content); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -290,10 +195,8 @@ public boolean equals(Object o) { ExportCreateVM exportCreateVM = (ExportCreateVM) o; return equalsNullable(this.templateId, exportCreateVM.templateId) && equalsNullable(this.reportId, exportCreateVM.reportId) && - equalsNullable(this.name, exportCreateVM.name) && - equalsNullable(this.tags, exportCreateVM.tags) && - equalsNullable(this.icon, exportCreateVM.icon) && - equalsNullable(this.content, exportCreateVM.content); + Objects.equals(this.$t, exportCreateVM.$t) && + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -302,7 +205,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(templateId), hashCodeNullable(reportId), hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash(hashCodeNullable(templateId), hashCodeNullable(reportId), $t, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -316,12 +219,10 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ExportCreateVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" templateId: ").append(toIndentedString(templateId)).append("\n"); sb.append(" reportId: ").append(toIndentedString(reportId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); - sb.append(" content: ").append(toIndentedString(content)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ExportFolderCreateVM.java b/src/main/java/cloud/fastreport/model/ExportFolderCreateVM.java index 0ea0700..4c03371 100644 --- a/src/main/java/cloud/fastreport/model/ExportFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/ExportFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,137 +35,36 @@ * ExportFolderCreateVM */ @JsonPropertyOrder({ - ExportFolderCreateVM.JSON_PROPERTY_NAME, - ExportFolderCreateVM.JSON_PROPERTY_TAGS, - ExportFolderCreateVM.JSON_PROPERTY_ICON }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class ExportFolderCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +public class ExportFolderCreateVM extends FolderCreateVM { public ExportFolderCreateVM() { - } + } + @Override public ExportFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public ExportFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - - return this; - } - - public ExportFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public ExportFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -173,10 +73,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - ExportFolderCreateVM exportFolderCreateVM = (ExportFolderCreateVM) o; - return equalsNullable(this.name, exportFolderCreateVM.name) && - equalsNullable(this.tags, exportFolderCreateVM.tags) && - equalsNullable(this.icon, exportFolderCreateVM.icon); + return super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +82,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -199,9 +96,7 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ExportFolderCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ExportVM.java b/src/main/java/cloud/fastreport/model/ExportVM.java index 5029820..fd4001b 100644 --- a/src/main/java/cloud/fastreport/model/ExportVM.java +++ b/src/main/java/cloud/fastreport/model/ExportVM.java @@ -16,6 +16,9 @@ import java.util.Objects; import java.util.Arrays; import cloud.fastreport.model.ExportFormat; +import cloud.fastreport.model.FileStatus; +import cloud.fastreport.model.FileStatusReason; +import cloud.fastreport.model.FileType; import cloud.fastreport.model.FileVM; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -26,6 +29,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -155,6 +161,12 @@ public void setTemplateId(String templateId) { this.templateId = JsonNullable.of(templateId); } + @Override + public ExportVM id(String id) { + this.setId(id); + return this; + } + @Override public ExportVM createdTime(OffsetDateTime createdTime) { this.setCreatedTime(createdTime); @@ -179,6 +191,72 @@ public ExportVM editorUserId(String editorUserId) { return this; } + @Override + public ExportVM name(String name) { + this.setName(name); + return this; + } + + @Override + public ExportVM parentId(String parentId) { + this.setParentId(parentId); + return this; + } + + @Override + public ExportVM tags(List tags) { + this.setTags(tags); + return this; + } + + @Override + public ExportVM icon(byte[] icon) { + this.setIcon(icon); + return this; + } + + @Override + public ExportVM type(FileType type) { + this.setType(type); + return this; + } + + @Override + public ExportVM size(Long size) { + this.setSize(size); + return this; + } + + @Override + public ExportVM subscriptionId(String subscriptionId) { + this.setSubscriptionId(subscriptionId); + return this; + } + + @Override + public ExportVM status(FileStatus status) { + this.setStatus(status); + return this; + } + + @Override + public ExportVM statusReason(FileStatusReason statusReason) { + this.setStatusReason(statusReason); + return this; + } + + @Override + public ExportVM errorMessage(String errorMessage) { + this.setErrorMessage(errorMessage); + return this; + } + + @Override + public ExportVM isDeleted(Boolean isDeleted) { + this.setIsDeleted(isDeleted); + return this; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/cloud/fastreport/model/FileCreateVM.java b/src/main/java/cloud/fastreport/model/FileCreateVM.java index 4d41a72..47bb2b3 100644 --- a/src/main/java/cloud/fastreport/model/FileCreateVM.java +++ b/src/main/java/cloud/fastreport/model/FileCreateVM.java @@ -15,9 +15,12 @@ import java.util.Objects; import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -37,9 +40,25 @@ FileCreateVM.JSON_PROPERTY_NAME, FileCreateVM.JSON_PROPERTY_TAGS, FileCreateVM.JSON_PROPERTY_ICON, - FileCreateVM.JSON_PROPERTY_CONTENT + FileCreateVM.JSON_PROPERTY_CONTENT, + FileCreateVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = ExportCreateAdminVM.class, name = "ExportCreateAdminVM"), + @JsonSubTypes.Type(value = ExportCreateVM.class, name = "ExportCreateVM"), + @JsonSubTypes.Type(value = FileCreateVM.class, name = "FileCreateVM"), + @JsonSubTypes.Type(value = ReportCreateAdminVM.class, name = "ReportCreateAdminVM"), + @JsonSubTypes.Type(value = ReportCreateVM.class, name = "ReportCreateVM"), + @JsonSubTypes.Type(value = TemplateCreateAdminVM.class, name = "TemplateCreateAdminVM"), + @JsonSubTypes.Type(value = TemplateCreateVM.class, name = "TemplateCreateVM"), +}) + public class FileCreateVM { public static final String JSON_PROPERTY_NAME = "name"; private JsonNullable name = JsonNullable.undefined(); @@ -53,6 +72,9 @@ public class FileCreateVM { public static final String JSON_PROPERTY_CONTENT = "content"; private JsonNullable content = JsonNullable.undefined(); + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; + public FileCreateVM() { } @@ -203,6 +225,32 @@ public void setContent(byte[] content) { this.content = JsonNullable.of(content); } + + public FileCreateVM $t(String $t) { + + this.$t = $t; + return this; + } + + /** + * Get $t + * @return $t + **/ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String get$T() { + return $t; + } + + + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -215,7 +263,8 @@ public boolean equals(Object o) { return equalsNullable(this.name, fileCreateVM.name) && equalsNullable(this.tags, fileCreateVM.tags) && equalsNullable(this.icon, fileCreateVM.icon) && - equalsNullable(this.content, fileCreateVM.content); + equalsNullable(this.content, fileCreateVM.content) && + Objects.equals(this.$t, fileCreateVM.$t); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -224,7 +273,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content), $t); } private static int hashCodeNullable(JsonNullable a) { @@ -242,6 +291,7 @@ public String toString() { sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); sb.append(" content: ").append(toIndentedString(content)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/FileVM.java b/src/main/java/cloud/fastreport/model/FileVM.java index a6024a8..b69a0e2 100644 --- a/src/main/java/cloud/fastreport/model/FileVM.java +++ b/src/main/java/cloud/fastreport/model/FileVM.java @@ -15,7 +15,6 @@ import java.util.Objects; import java.util.Arrays; -import cloud.fastreport.model.EntityVM; import cloud.fastreport.model.FileStatus; import cloud.fastreport.model.FileStatusReason; import cloud.fastreport.model.FileType; @@ -42,6 +41,11 @@ * FileVM */ @JsonPropertyOrder({ + FileVM.JSON_PROPERTY_ID, + FileVM.JSON_PROPERTY_CREATED_TIME, + FileVM.JSON_PROPERTY_CREATOR_USER_ID, + FileVM.JSON_PROPERTY_EDITED_TIME, + FileVM.JSON_PROPERTY_EDITOR_USER_ID, FileVM.JSON_PROPERTY_NAME, FileVM.JSON_PROPERTY_PARENT_ID, FileVM.JSON_PROPERTY_TAGS, @@ -68,7 +72,22 @@ @JsonSubTypes.Type(value = TemplateVM.class, name = "TemplateVM"), }) -public class FileVM extends EntityVM { +public class FileVM { + public static final String JSON_PROPERTY_ID = "id"; + private JsonNullable id = JsonNullable.undefined(); + + public static final String JSON_PROPERTY_CREATED_TIME = "createdTime"; + private OffsetDateTime createdTime; + + public static final String JSON_PROPERTY_CREATOR_USER_ID = "creatorUserId"; + private JsonNullable creatorUserId = JsonNullable.undefined(); + + public static final String JSON_PROPERTY_EDITED_TIME = "editedTime"; + private OffsetDateTime editedTime; + + public static final String JSON_PROPERTY_EDITOR_USER_ID = "editorUserId"; + private JsonNullable editorUserId = JsonNullable.undefined(); + public static final String JSON_PROPERTY_NAME = "name"; private JsonNullable name = JsonNullable.undefined(); @@ -106,9 +125,162 @@ public class FileVM extends EntityVM { protected String $t; public FileVM() { + } + + public FileVM id(String id) { + this.id = JsonNullable.of(id); + + return this; + } + + /** + * Get id + * @return id + **/ + @javax.annotation.Nullable + @JsonIgnore + + public String getId() { + return id.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getId_JsonNullable() { + return id; + } + + @JsonProperty(JSON_PROPERTY_ID) + public void setId_JsonNullable(JsonNullable id) { + this.id = id; + } + + public void setId(String id) { + this.id = JsonNullable.of(id); + } + + + public FileVM createdTime(OffsetDateTime createdTime) { + + this.createdTime = createdTime; + return this; + } + + /** + * Get createdTime + * @return createdTime + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_CREATED_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OffsetDateTime getCreatedTime() { + return createdTime; + } + + + @JsonProperty(JSON_PROPERTY_CREATED_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setCreatedTime(OffsetDateTime createdTime) { + this.createdTime = createdTime; + } + + + public FileVM creatorUserId(String creatorUserId) { + this.creatorUserId = JsonNullable.of(creatorUserId); + + return this; + } + + /** + * Get creatorUserId + * @return creatorUserId + **/ + @javax.annotation.Nullable + @JsonIgnore + + public String getCreatorUserId() { + return creatorUserId.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_CREATOR_USER_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getCreatorUserId_JsonNullable() { + return creatorUserId; + } + + @JsonProperty(JSON_PROPERTY_CREATOR_USER_ID) + public void setCreatorUserId_JsonNullable(JsonNullable creatorUserId) { + this.creatorUserId = creatorUserId; + } + + public void setCreatorUserId(String creatorUserId) { + this.creatorUserId = JsonNullable.of(creatorUserId); + } + + + public FileVM editedTime(OffsetDateTime editedTime) { + + this.editedTime = editedTime; + return this; + } + + /** + * Get editedTime + * @return editedTime + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_EDITED_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public OffsetDateTime getEditedTime() { + return editedTime; + } + + + @JsonProperty(JSON_PROPERTY_EDITED_TIME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setEditedTime(OffsetDateTime editedTime) { + this.editedTime = editedTime; + } + + + public FileVM editorUserId(String editorUserId) { + this.editorUserId = JsonNullable.of(editorUserId); + + return this; + } + + /** + * Get editorUserId + * @return editorUserId + **/ + @javax.annotation.Nullable + @JsonIgnore + + public String getEditorUserId() { + return editorUserId.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_EDITOR_USER_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public JsonNullable getEditorUserId_JsonNullable() { + return editorUserId; + } + + @JsonProperty(JSON_PROPERTY_EDITOR_USER_ID) + public void setEditorUserId_JsonNullable(JsonNullable editorUserId) { + this.editorUserId = editorUserId; } + public void setEditorUserId(String editorUserId) { + this.editorUserId = JsonNullable.of(editorUserId); + } + + public FileVM name(String name) { this.name = JsonNullable.of(name); @@ -480,30 +652,6 @@ public void setIsDeleted(Boolean isDeleted) { this.$t = $t; } - @Override - public FileVM createdTime(OffsetDateTime createdTime) { - this.setCreatedTime(createdTime); - return this; - } - - @Override - public FileVM creatorUserId(String creatorUserId) { - this.setCreatorUserId(creatorUserId); - return this; - } - - @Override - public FileVM editedTime(OffsetDateTime editedTime) { - this.setEditedTime(editedTime); - return this; - } - - @Override - public FileVM editorUserId(String editorUserId) { - this.setEditorUserId(editorUserId); - return this; - } - @Override public boolean equals(Object o) { if (this == o) { @@ -513,7 +661,12 @@ public boolean equals(Object o) { return false; } FileVM fileVM = (FileVM) o; - return equalsNullable(this.name, fileVM.name) && + return equalsNullable(this.id, fileVM.id) && + Objects.equals(this.createdTime, fileVM.createdTime) && + equalsNullable(this.creatorUserId, fileVM.creatorUserId) && + Objects.equals(this.editedTime, fileVM.editedTime) && + equalsNullable(this.editorUserId, fileVM.editorUserId) && + equalsNullable(this.name, fileVM.name) && equalsNullable(this.parentId, fileVM.parentId) && equalsNullable(this.tags, fileVM.tags) && equalsNullable(this.icon, fileVM.icon) && @@ -524,8 +677,7 @@ public boolean equals(Object o) { Objects.equals(this.statusReason, fileVM.statusReason) && equalsNullable(this.errorMessage, fileVM.errorMessage) && Objects.equals(this.isDeleted, fileVM.isDeleted) && - Objects.equals(this.$t, fileVM.$t) && - super.equals(o); + Objects.equals(this.$t, fileVM.$t); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -534,7 +686,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(parentId), hashCodeNullable(tags), hashCodeNullable(icon), type, size, hashCodeNullable(subscriptionId), status, statusReason, hashCodeNullable(errorMessage), isDeleted, $t, super.hashCode()); + return Objects.hash(hashCodeNullable(id), createdTime, hashCodeNullable(creatorUserId), editedTime, hashCodeNullable(editorUserId), hashCodeNullable(name), hashCodeNullable(parentId), hashCodeNullable(tags), hashCodeNullable(icon), type, size, hashCodeNullable(subscriptionId), status, statusReason, hashCodeNullable(errorMessage), isDeleted, $t); } private static int hashCodeNullable(JsonNullable a) { @@ -548,7 +700,11 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class FileVM {\n"); - sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" createdTime: ").append(toIndentedString(createdTime)).append("\n"); + sb.append(" creatorUserId: ").append(toIndentedString(creatorUserId)).append("\n"); + sb.append(" editedTime: ").append(toIndentedString(editedTime)).append("\n"); + sb.append(" editorUserId: ").append(toIndentedString(editorUserId)).append("\n"); sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" parentId: ").append(toIndentedString(parentId)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); diff --git a/src/main/java/cloud/fastreport/model/FolderCreateVM.java b/src/main/java/cloud/fastreport/model/FolderCreateVM.java index 34cac98..b860d7e 100644 --- a/src/main/java/cloud/fastreport/model/FolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/FolderCreateVM.java @@ -15,9 +15,12 @@ import java.util.Objects; import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -36,9 +39,26 @@ @JsonPropertyOrder({ FolderCreateVM.JSON_PROPERTY_NAME, FolderCreateVM.JSON_PROPERTY_TAGS, - FolderCreateVM.JSON_PROPERTY_ICON + FolderCreateVM.JSON_PROPERTY_ICON, + FolderCreateVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = AdminExportFolderCreateVM.class, name = "AdminExportFolderCreateVM"), + @JsonSubTypes.Type(value = AdminFolderCreateVM.class, name = "AdminFolderCreateVM"), + @JsonSubTypes.Type(value = AdminReportFolderCreateVM.class, name = "AdminReportFolderCreateVM"), + @JsonSubTypes.Type(value = AdminTemplateFolderCreateVM.class, name = "AdminTemplateFolderCreateVM"), + @JsonSubTypes.Type(value = ExportFolderCreateVM.class, name = "ExportFolderCreateVM"), + @JsonSubTypes.Type(value = FolderCreateVM.class, name = "FolderCreateVM"), + @JsonSubTypes.Type(value = ReportFolderCreateVM.class, name = "ReportFolderCreateVM"), + @JsonSubTypes.Type(value = TemplateFolderCreateVM.class, name = "TemplateFolderCreateVM"), +}) + public class FolderCreateVM { public static final String JSON_PROPERTY_NAME = "name"; private JsonNullable name = JsonNullable.undefined(); @@ -49,6 +69,9 @@ public class FolderCreateVM { public static final String JSON_PROPERTY_ICON = "icon"; private JsonNullable icon = JsonNullable.undefined(); + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; + public FolderCreateVM() { } @@ -165,6 +188,32 @@ public void setIcon(byte[] icon) { this.icon = JsonNullable.of(icon); } + + public FolderCreateVM $t(String $t) { + + this.$t = $t; + return this; + } + + /** + * Get $t + * @return $t + **/ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String get$T() { + return $t; + } + + + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -176,7 +225,8 @@ public boolean equals(Object o) { FolderCreateVM folderCreateVM = (FolderCreateVM) o; return equalsNullable(this.name, folderCreateVM.name) && equalsNullable(this.tags, folderCreateVM.tags) && - equalsNullable(this.icon, folderCreateVM.icon); + equalsNullable(this.icon, folderCreateVM.icon) && + Objects.equals(this.$t, folderCreateVM.$t); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +235,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), $t); } private static int hashCodeNullable(JsonNullable a) { @@ -202,6 +252,7 @@ public String toString() { sb.append(" name: ").append(toIndentedString(name)).append("\n"); sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ReportCreateAdminVM.java b/src/main/java/cloud/fastreport/model/ReportCreateAdminVM.java index 1b5209b..0ad0964 100644 --- a/src/main/java/cloud/fastreport/model/ReportCreateAdminVM.java +++ b/src/main/java/cloud/fastreport/model/ReportCreateAdminVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.ReportCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -35,33 +36,24 @@ */ @JsonPropertyOrder({ ReportCreateAdminVM.JSON_PROPERTY_OWNER_ID, - ReportCreateAdminVM.JSON_PROPERTY_PARENT_ID, - ReportCreateAdminVM.JSON_PROPERTY_NAME, - ReportCreateAdminVM.JSON_PROPERTY_TAGS, - ReportCreateAdminVM.JSON_PROPERTY_ICON, - ReportCreateAdminVM.JSON_PROPERTY_CONTENT + ReportCreateAdminVM.JSON_PROPERTY_PARENT_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class ReportCreateAdminVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) + +public class ReportCreateAdminVM extends ReportCreateVM { public static final String JSON_PROPERTY_OWNER_ID = "ownerId"; private String ownerId; public static final String JSON_PROPERTY_PARENT_ID = "parentId"; private String parentId; - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CONTENT = "content"; - private JsonNullable content = JsonNullable.undefined(); - public ReportCreateAdminVM() { + } public ReportCreateAdminVM ownerId(String ownerId) { @@ -115,154 +107,30 @@ public void setParentId(String parentId) { this.parentId = parentId; } - + @Override public ReportCreateAdminVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public ReportCreateAdminVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + this.setTags(tags); return this; } - public ReportCreateAdminVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } - return this; - } - - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public ReportCreateAdminVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - - + @Override public ReportCreateAdminVM content(byte[] content) { - this.content = JsonNullable.of(content); - + this.setContent(content); return this; } - /** - * Get content - * @return content - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getContent() { - return content.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getContent_JsonNullable() { - return content; - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - public void setContent_JsonNullable(JsonNullable content) { - this.content = content; - } - - public void setContent(byte[] content) { - this.content = JsonNullable.of(content); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -274,10 +142,7 @@ public boolean equals(Object o) { ReportCreateAdminVM reportCreateAdminVM = (ReportCreateAdminVM) o; return Objects.equals(this.ownerId, reportCreateAdminVM.ownerId) && Objects.equals(this.parentId, reportCreateAdminVM.parentId) && - equalsNullable(this.name, reportCreateAdminVM.name) && - equalsNullable(this.tags, reportCreateAdminVM.tags) && - equalsNullable(this.icon, reportCreateAdminVM.icon) && - equalsNullable(this.content, reportCreateAdminVM.content); + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -286,7 +151,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(ownerId, parentId, hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash(ownerId, parentId, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -300,12 +165,9 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ReportCreateAdminVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); sb.append(" parentId: ").append(toIndentedString(parentId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); - sb.append(" content: ").append(toIndentedString(content)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ReportCreateVM.java b/src/main/java/cloud/fastreport/model/ReportCreateVM.java index 07c5f4e..4910836 100644 --- a/src/main/java/cloud/fastreport/model/ReportCreateVM.java +++ b/src/main/java/cloud/fastreport/model/ReportCreateVM.java @@ -15,9 +15,13 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FileCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -35,29 +39,28 @@ */ @JsonPropertyOrder({ ReportCreateVM.JSON_PROPERTY_TEMPLATE_ID, - ReportCreateVM.JSON_PROPERTY_NAME, - ReportCreateVM.JSON_PROPERTY_TAGS, - ReportCreateVM.JSON_PROPERTY_ICON, - ReportCreateVM.JSON_PROPERTY_CONTENT + ReportCreateVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class ReportCreateVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = ReportCreateAdminVM.class, name = "ReportCreateAdminVM"), + @JsonSubTypes.Type(value = ReportCreateVM.class, name = "ReportCreateVM"), +}) + +public class ReportCreateVM extends FileCreateVM { public static final String JSON_PROPERTY_TEMPLATE_ID = "templateId"; private JsonNullable templateId = JsonNullable.undefined(); - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CONTENT = "content"; - private JsonNullable content = JsonNullable.undefined(); + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; public ReportCreateVM() { + } public ReportCreateVM templateId(String templateId) { @@ -94,153 +97,55 @@ public void setTemplateId(String templateId) { } - public ReportCreateVM name(String name) { - this.name = JsonNullable.of(name); + public ReportCreateVM $t(String $t) { + this.$t = $t; return this; } /** - * Get name - * @return name + * Get $t + * @return $t **/ - @javax.annotation.Nullable - @JsonIgnore + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) - public String getName() { - return name.orElse(null); + public String get$T() { + return $t; } - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public JsonNullable getName_JsonNullable() { - return name; + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - public ReportCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + @Override + public ReportCreateVM name(String name) { + this.setName(name); return this; } - public ReportCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + @Override + public ReportCreateVM tags(List tags) { + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public ReportCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - - + @Override public ReportCreateVM content(byte[] content) { - this.content = JsonNullable.of(content); - + this.setContent(content); return this; } - /** - * Get content - * @return content - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getContent() { - return content.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getContent_JsonNullable() { - return content; - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - public void setContent_JsonNullable(JsonNullable content) { - this.content = content; - } - - public void setContent(byte[] content) { - this.content = JsonNullable.of(content); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -251,10 +156,8 @@ public boolean equals(Object o) { } ReportCreateVM reportCreateVM = (ReportCreateVM) o; return equalsNullable(this.templateId, reportCreateVM.templateId) && - equalsNullable(this.name, reportCreateVM.name) && - equalsNullable(this.tags, reportCreateVM.tags) && - equalsNullable(this.icon, reportCreateVM.icon) && - equalsNullable(this.content, reportCreateVM.content); + Objects.equals(this.$t, reportCreateVM.$t) && + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -263,7 +166,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(templateId), hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash(hashCodeNullable(templateId), $t, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -277,11 +180,9 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ReportCreateVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" templateId: ").append(toIndentedString(templateId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); - sb.append(" content: ").append(toIndentedString(content)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ReportFolderCreateVM.java b/src/main/java/cloud/fastreport/model/ReportFolderCreateVM.java index 4a68c44..01465bf 100644 --- a/src/main/java/cloud/fastreport/model/ReportFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/ReportFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,137 +35,36 @@ * ReportFolderCreateVM */ @JsonPropertyOrder({ - ReportFolderCreateVM.JSON_PROPERTY_NAME, - ReportFolderCreateVM.JSON_PROPERTY_TAGS, - ReportFolderCreateVM.JSON_PROPERTY_ICON }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class ReportFolderCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +public class ReportFolderCreateVM extends FolderCreateVM { public ReportFolderCreateVM() { - } + } + @Override public ReportFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public ReportFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - - return this; - } - - public ReportFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public ReportFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -173,10 +73,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - ReportFolderCreateVM reportFolderCreateVM = (ReportFolderCreateVM) o; - return equalsNullable(this.name, reportFolderCreateVM.name) && - equalsNullable(this.tags, reportFolderCreateVM.tags) && - equalsNullable(this.icon, reportFolderCreateVM.icon); + return super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +82,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -199,9 +96,7 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ReportFolderCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/ReportVM.java b/src/main/java/cloud/fastreport/model/ReportVM.java index 71f1485..eb0e511 100644 --- a/src/main/java/cloud/fastreport/model/ReportVM.java +++ b/src/main/java/cloud/fastreport/model/ReportVM.java @@ -15,6 +15,9 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FileStatus; +import cloud.fastreport.model.FileStatusReason; +import cloud.fastreport.model.FileType; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.ReportInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -26,6 +29,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -117,6 +123,12 @@ public void setReportInfo(ReportInfo reportInfo) { this.reportInfo = reportInfo; } + @Override + public ReportVM id(String id) { + this.setId(id); + return this; + } + @Override public ReportVM createdTime(OffsetDateTime createdTime) { this.setCreatedTime(createdTime); @@ -141,6 +153,72 @@ public ReportVM editorUserId(String editorUserId) { return this; } + @Override + public ReportVM name(String name) { + this.setName(name); + return this; + } + + @Override + public ReportVM parentId(String parentId) { + this.setParentId(parentId); + return this; + } + + @Override + public ReportVM tags(List tags) { + this.setTags(tags); + return this; + } + + @Override + public ReportVM icon(byte[] icon) { + this.setIcon(icon); + return this; + } + + @Override + public ReportVM type(FileType type) { + this.setType(type); + return this; + } + + @Override + public ReportVM size(Long size) { + this.setSize(size); + return this; + } + + @Override + public ReportVM subscriptionId(String subscriptionId) { + this.setSubscriptionId(subscriptionId); + return this; + } + + @Override + public ReportVM status(FileStatus status) { + this.setStatus(status); + return this; + } + + @Override + public ReportVM statusReason(FileStatusReason statusReason) { + this.setStatusReason(statusReason); + return this; + } + + @Override + public ReportVM errorMessage(String errorMessage) { + this.setErrorMessage(errorMessage); + return this; + } + + @Override + public ReportVM isDeleted(Boolean isDeleted) { + this.setIsDeleted(isDeleted); + return this; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/cloud/fastreport/model/SubscriptionVM.java b/src/main/java/cloud/fastreport/model/SubscriptionVM.java index 3c0eab1..26eacd9 100644 --- a/src/main/java/cloud/fastreport/model/SubscriptionVM.java +++ b/src/main/java/cloud/fastreport/model/SubscriptionVM.java @@ -17,9 +17,12 @@ import java.util.Arrays; import cloud.fastreport.model.SubscriptionFolder; import cloud.fastreport.model.SubscriptionPeriodVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -43,9 +46,20 @@ SubscriptionVM.JSON_PROPERTY_OLD, SubscriptionVM.JSON_PROPERTY_TEMPLATES_FOLDER, SubscriptionVM.JSON_PROPERTY_REPORTS_FOLDER, - SubscriptionVM.JSON_PROPERTY_EXPORTS_FOLDER + SubscriptionVM.JSON_PROPERTY_EXPORTS_FOLDER, + SubscriptionVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = AdminSubscriptionVM.class, name = "AdminSubscriptionVM"), + @JsonSubTypes.Type(value = SubscriptionVM.class, name = "SubscriptionVM"), +}) + public class SubscriptionVM { public static final String JSON_PROPERTY_ID = "id"; private JsonNullable id = JsonNullable.undefined(); @@ -71,6 +85,9 @@ public class SubscriptionVM { public static final String JSON_PROPERTY_EXPORTS_FOLDER = "exportsFolder"; private SubscriptionFolder exportsFolder; + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; + public SubscriptionVM() { } @@ -325,6 +342,32 @@ public void setExportsFolder(SubscriptionFolder exportsFolder) { this.exportsFolder = exportsFolder; } + + public SubscriptionVM $t(String $t) { + + this.$t = $t; + return this; + } + + /** + * Get $t + * @return $t + **/ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String get$T() { + return $t; + } + + + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -341,7 +384,8 @@ public boolean equals(Object o) { equalsNullable(this.old, subscriptionVM.old) && Objects.equals(this.templatesFolder, subscriptionVM.templatesFolder) && Objects.equals(this.reportsFolder, subscriptionVM.reportsFolder) && - Objects.equals(this.exportsFolder, subscriptionVM.exportsFolder); + Objects.equals(this.exportsFolder, subscriptionVM.exportsFolder) && + Objects.equals(this.$t, subscriptionVM.$t); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -350,7 +394,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(id), hashCodeNullable(name), hashCodeNullable(locale), current, hashCodeNullable(old), templatesFolder, reportsFolder, exportsFolder); + return Objects.hash(hashCodeNullable(id), hashCodeNullable(name), hashCodeNullable(locale), current, hashCodeNullable(old), templatesFolder, reportsFolder, exportsFolder, $t); } private static int hashCodeNullable(JsonNullable a) { @@ -372,6 +416,7 @@ public String toString() { sb.append(" templatesFolder: ").append(toIndentedString(templatesFolder)).append("\n"); sb.append(" reportsFolder: ").append(toIndentedString(reportsFolder)).append("\n"); sb.append(" exportsFolder: ").append(toIndentedString(exportsFolder)).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/TemplateCreateAdminVM.java b/src/main/java/cloud/fastreport/model/TemplateCreateAdminVM.java index 3c5b845..02de9a6 100644 --- a/src/main/java/cloud/fastreport/model/TemplateCreateAdminVM.java +++ b/src/main/java/cloud/fastreport/model/TemplateCreateAdminVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.TemplateCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -35,33 +36,24 @@ */ @JsonPropertyOrder({ TemplateCreateAdminVM.JSON_PROPERTY_OWNER_ID, - TemplateCreateAdminVM.JSON_PROPERTY_PARENT_ID, - TemplateCreateAdminVM.JSON_PROPERTY_NAME, - TemplateCreateAdminVM.JSON_PROPERTY_TAGS, - TemplateCreateAdminVM.JSON_PROPERTY_ICON, - TemplateCreateAdminVM.JSON_PROPERTY_CONTENT + TemplateCreateAdminVM.JSON_PROPERTY_PARENT_ID }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class TemplateCreateAdminVM { +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) + +public class TemplateCreateAdminVM extends TemplateCreateVM { public static final String JSON_PROPERTY_OWNER_ID = "ownerId"; private String ownerId; public static final String JSON_PROPERTY_PARENT_ID = "parentId"; private String parentId; - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_CONTENT = "content"; - private JsonNullable content = JsonNullable.undefined(); - public TemplateCreateAdminVM() { + } public TemplateCreateAdminVM ownerId(String ownerId) { @@ -115,154 +107,30 @@ public void setParentId(String parentId) { this.parentId = parentId; } - + @Override public TemplateCreateAdminVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public TemplateCreateAdminVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + this.setTags(tags); return this; } - public TemplateCreateAdminVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } - return this; - } - - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public TemplateCreateAdminVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - - + @Override public TemplateCreateAdminVM content(byte[] content) { - this.content = JsonNullable.of(content); - + this.setContent(content); return this; } - /** - * Get content - * @return content - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getContent() { - return content.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getContent_JsonNullable() { - return content; - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - public void setContent_JsonNullable(JsonNullable content) { - this.content = content; - } - - public void setContent(byte[] content) { - this.content = JsonNullable.of(content); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -274,10 +142,7 @@ public boolean equals(Object o) { TemplateCreateAdminVM templateCreateAdminVM = (TemplateCreateAdminVM) o; return Objects.equals(this.ownerId, templateCreateAdminVM.ownerId) && Objects.equals(this.parentId, templateCreateAdminVM.parentId) && - equalsNullable(this.name, templateCreateAdminVM.name) && - equalsNullable(this.tags, templateCreateAdminVM.tags) && - equalsNullable(this.icon, templateCreateAdminVM.icon) && - equalsNullable(this.content, templateCreateAdminVM.content); + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -286,7 +151,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(ownerId, parentId, hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash(ownerId, parentId, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -300,12 +165,9 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TemplateCreateAdminVM {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append(" ownerId: ").append(toIndentedString(ownerId)).append("\n"); sb.append(" parentId: ").append(toIndentedString(parentId)).append("\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); - sb.append(" content: ").append(toIndentedString(content)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/TemplateCreateVM.java b/src/main/java/cloud/fastreport/model/TemplateCreateVM.java index 9292549..650c572 100644 --- a/src/main/java/cloud/fastreport/model/TemplateCreateVM.java +++ b/src/main/java/cloud/fastreport/model/TemplateCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FileCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,175 +35,76 @@ * TemplateCreateVM */ @JsonPropertyOrder({ - TemplateCreateVM.JSON_PROPERTY_NAME, - TemplateCreateVM.JSON_PROPERTY_TAGS, - TemplateCreateVM.JSON_PROPERTY_ICON, - TemplateCreateVM.JSON_PROPERTY_CONTENT + TemplateCreateVM.JSON_PROPERTY_$_T }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class TemplateCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = TemplateCreateAdminVM.class, name = "TemplateCreateAdminVM"), + @JsonSubTypes.Type(value = TemplateCreateVM.class, name = "TemplateCreateVM"), +}) - public static final String JSON_PROPERTY_CONTENT = "content"; - private JsonNullable content = JsonNullable.undefined(); +public class TemplateCreateVM extends FileCreateVM { + public static final String JSON_PROPERTY_$_T = "$t"; + protected String $t; public TemplateCreateVM() { + } - public TemplateCreateVM name(String name) { - this.name = JsonNullable.of(name); + public TemplateCreateVM $t(String $t) { + this.$t = $t; return this; } /** - * Get name - * @return name + * Get $t + * @return $t **/ - @javax.annotation.Nullable - @JsonIgnore + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) - public String getName() { - return name.orElse(null); + public String get$T() { + return $t; } - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; + @JsonProperty(JSON_PROPERTY_$_T) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void set$T(String $t) { + this.$t = $t; } - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - - public TemplateCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - + @Override + public TemplateCreateVM name(String name) { + this.setName(name); return this; } - public TemplateCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + @Override + public TemplateCreateVM tags(List tags) { + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public TemplateCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - - + @Override public TemplateCreateVM content(byte[] content) { - this.content = JsonNullable.of(content); - + this.setContent(content); return this; } - /** - * Get content - * @return content - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getContent() { - return content.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getContent_JsonNullable() { - return content; - } - - @JsonProperty(JSON_PROPERTY_CONTENT) - public void setContent_JsonNullable(JsonNullable content) { - this.content = content; - } - - public void setContent(byte[] content) { - this.content = JsonNullable.of(content); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -212,10 +114,8 @@ public boolean equals(Object o) { return false; } TemplateCreateVM templateCreateVM = (TemplateCreateVM) o; - return equalsNullable(this.name, templateCreateVM.name) && - equalsNullable(this.tags, templateCreateVM.tags) && - equalsNullable(this.icon, templateCreateVM.icon) && - equalsNullable(this.content, templateCreateVM.content); + return Objects.equals(this.$t, templateCreateVM.$t) && + super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -224,7 +124,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon), hashCodeNullable(content)); + return Objects.hash($t, super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -238,10 +138,8 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TemplateCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); - sb.append(" content: ").append(toIndentedString(content)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" $t: ").append(toIndentedString($t)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/TemplateFolderCreateVM.java b/src/main/java/cloud/fastreport/model/TemplateFolderCreateVM.java index 310d051..42644ae 100644 --- a/src/main/java/cloud/fastreport/model/TemplateFolderCreateVM.java +++ b/src/main/java/cloud/fastreport/model/TemplateFolderCreateVM.java @@ -15,18 +15,19 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -34,137 +35,36 @@ * TemplateFolderCreateVM */ @JsonPropertyOrder({ - TemplateFolderCreateVM.JSON_PROPERTY_NAME, - TemplateFolderCreateVM.JSON_PROPERTY_TAGS, - TemplateFolderCreateVM.JSON_PROPERTY_ICON }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") -public class TemplateFolderCreateVM { - public static final String JSON_PROPERTY_NAME = "name"; - private JsonNullable name = JsonNullable.undefined(); - - public static final String JSON_PROPERTY_TAGS = "tags"; - private JsonNullable> tags = JsonNullable.>undefined(); - - public static final String JSON_PROPERTY_ICON = "icon"; - private JsonNullable icon = JsonNullable.undefined(); +@JsonIgnoreProperties( + value = "$t", // ignore manually set $t, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the $t to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$t", visible = true) +public class TemplateFolderCreateVM extends FolderCreateVM { public TemplateFolderCreateVM() { - } + } + @Override public TemplateFolderCreateVM name(String name) { - this.name = JsonNullable.of(name); - + this.setName(name); return this; } - /** - * Get name - * @return name - **/ - @javax.annotation.Nullable - @JsonIgnore - - public String getName() { - return name.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_NAME) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getName_JsonNullable() { - return name; - } - - @JsonProperty(JSON_PROPERTY_NAME) - public void setName_JsonNullable(JsonNullable name) { - this.name = name; - } - - public void setName(String name) { - this.name = JsonNullable.of(name); - } - - + @Override public TemplateFolderCreateVM tags(List tags) { - this.tags = JsonNullable.>of(tags); - - return this; - } - - public TemplateFolderCreateVM addTagsItem(String tagsItem) { - if (this.tags == null || !this.tags.isPresent()) { - this.tags = JsonNullable.>of(new ArrayList<>()); - } - try { - this.tags.get().add(tagsItem); - } catch (java.util.NoSuchElementException e) { - // this can never happen, as we make sure above that the value is present - } + this.setTags(tags); return this; } - /** - * Get tags - * @return tags - **/ - @javax.annotation.Nullable - @JsonIgnore - - public List getTags() { - return tags.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_TAGS) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable> getTags_JsonNullable() { - return tags; - } - - @JsonProperty(JSON_PROPERTY_TAGS) - public void setTags_JsonNullable(JsonNullable> tags) { - this.tags = tags; - } - - public void setTags(List tags) { - this.tags = JsonNullable.>of(tags); - } - - + @Override public TemplateFolderCreateVM icon(byte[] icon) { - this.icon = JsonNullable.of(icon); - + this.setIcon(icon); return this; } - /** - * Get icon - * @return icon - **/ - @javax.annotation.Nullable - @JsonIgnore - - public byte[] getIcon() { - return icon.orElse(null); - } - - @JsonProperty(JSON_PROPERTY_ICON) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - - public JsonNullable getIcon_JsonNullable() { - return icon; - } - - @JsonProperty(JSON_PROPERTY_ICON) - public void setIcon_JsonNullable(JsonNullable icon) { - this.icon = icon; - } - - public void setIcon(byte[] icon) { - this.icon = JsonNullable.of(icon); - } - @Override public boolean equals(Object o) { if (this == o) { @@ -173,10 +73,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) { return false; } - TemplateFolderCreateVM templateFolderCreateVM = (TemplateFolderCreateVM) o; - return equalsNullable(this.name, templateFolderCreateVM.name) && - equalsNullable(this.tags, templateFolderCreateVM.tags) && - equalsNullable(this.icon, templateFolderCreateVM.icon); + return super.equals(o); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -185,7 +82,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(hashCodeNullable(name), hashCodeNullable(tags), hashCodeNullable(icon)); + return Objects.hash(super.hashCode()); } private static int hashCodeNullable(JsonNullable a) { @@ -199,9 +96,7 @@ private static int hashCodeNullable(JsonNullable a) { public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class TemplateFolderCreateVM {\n"); - sb.append(" name: ").append(toIndentedString(name)).append("\n"); - sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); - sb.append(" icon: ").append(toIndentedString(icon)).append("\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/src/main/java/cloud/fastreport/model/TemplateVM.java b/src/main/java/cloud/fastreport/model/TemplateVM.java index abb091b..4d36868 100644 --- a/src/main/java/cloud/fastreport/model/TemplateVM.java +++ b/src/main/java/cloud/fastreport/model/TemplateVM.java @@ -15,6 +15,9 @@ import java.util.Objects; import java.util.Arrays; +import cloud.fastreport.model.FileStatus; +import cloud.fastreport.model.FileStatusReason; +import cloud.fastreport.model.FileType; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.ReportInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -26,6 +29,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.JsonTypeName; @@ -76,6 +82,12 @@ public void setReportInfo(ReportInfo reportInfo) { this.reportInfo = reportInfo; } + @Override + public TemplateVM id(String id) { + this.setId(id); + return this; + } + @Override public TemplateVM createdTime(OffsetDateTime createdTime) { this.setCreatedTime(createdTime); @@ -100,6 +112,72 @@ public TemplateVM editorUserId(String editorUserId) { return this; } + @Override + public TemplateVM name(String name) { + this.setName(name); + return this; + } + + @Override + public TemplateVM parentId(String parentId) { + this.setParentId(parentId); + return this; + } + + @Override + public TemplateVM tags(List tags) { + this.setTags(tags); + return this; + } + + @Override + public TemplateVM icon(byte[] icon) { + this.setIcon(icon); + return this; + } + + @Override + public TemplateVM type(FileType type) { + this.setType(type); + return this; + } + + @Override + public TemplateVM size(Long size) { + this.setSize(size); + return this; + } + + @Override + public TemplateVM subscriptionId(String subscriptionId) { + this.setSubscriptionId(subscriptionId); + return this; + } + + @Override + public TemplateVM status(FileStatus status) { + this.setStatus(status); + return this; + } + + @Override + public TemplateVM statusReason(FileStatusReason statusReason) { + this.setStatusReason(statusReason); + return this; + } + + @Override + public TemplateVM errorMessage(String errorMessage) { + this.setErrorMessage(errorMessage); + return this; + } + + @Override + public TemplateVM isDeleted(Boolean isDeleted) { + this.setIsDeleted(isDeleted); + return this; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/test/java/cloud/fastreport/client/ExportsApiTest.java b/src/test/java/cloud/fastreport/client/ExportsApiTest.java index 92f48e7..4494ae4 100644 --- a/src/test/java/cloud/fastreport/client/ExportsApiTest.java +++ b/src/test/java/cloud/fastreport/client/ExportsApiTest.java @@ -26,6 +26,7 @@ import cloud.fastreport.model.FileTagsUpdateVM; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.FilesVM; +import cloud.fastreport.model.FolderCreateVM; import cloud.fastreport.model.FolderIconVM; import cloud.fastreport.model.FolderRenameVM; import cloud.fastreport.model.FolderSizeVM; diff --git a/src/test/java/cloud/fastreport/client/ReportsApiTest.java b/src/test/java/cloud/fastreport/client/ReportsApiTest.java index 03ce2a8..bab8617 100644 --- a/src/test/java/cloud/fastreport/client/ReportsApiTest.java +++ b/src/test/java/cloud/fastreport/client/ReportsApiTest.java @@ -26,6 +26,7 @@ import cloud.fastreport.model.FileTagsUpdateVM; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.FilesVM; +import cloud.fastreport.model.FolderCreateVM; import cloud.fastreport.model.FolderIconVM; import cloud.fastreport.model.FolderRenameVM; import cloud.fastreport.model.FolderSizeVM; diff --git a/src/test/java/cloud/fastreport/client/TemplatesApiTest.java b/src/test/java/cloud/fastreport/client/TemplatesApiTest.java index 7069b60..c64d594 100644 --- a/src/test/java/cloud/fastreport/client/TemplatesApiTest.java +++ b/src/test/java/cloud/fastreport/client/TemplatesApiTest.java @@ -26,6 +26,7 @@ import cloud.fastreport.model.FileTagsUpdateVM; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.FilesVM; +import cloud.fastreport.model.FolderCreateVM; import cloud.fastreport.model.FolderIconVM; import cloud.fastreport.model.FolderRenameVM; import cloud.fastreport.model.FolderSizeVM; diff --git a/src/test/java/cloud/fastreport/model/AdminExportFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/AdminExportFolderCreateVMTest.java index 6840af0..0416a2f 100644 --- a/src/test/java/cloud/fastreport/model/AdminExportFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/AdminExportFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.AdminFolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/AdminFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/AdminFolderCreateVMTest.java index 54f1e41..89722dd 100644 --- a/src/test/java/cloud/fastreport/model/AdminFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/AdminFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/AdminReportFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/AdminReportFolderCreateVMTest.java index 92f99c3..bd47cb7 100644 --- a/src/test/java/cloud/fastreport/model/AdminReportFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/AdminReportFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.AdminFolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/AdminSubscriptionVMTest.java b/src/test/java/cloud/fastreport/model/AdminSubscriptionVMTest.java index 5812da8..6384fbd 100644 --- a/src/test/java/cloud/fastreport/model/AdminSubscriptionVMTest.java +++ b/src/test/java/cloud/fastreport/model/AdminSubscriptionVMTest.java @@ -16,9 +16,13 @@ import cloud.fastreport.model.DefaultPermissionsVM; import cloud.fastreport.model.SubscriptionFolder; import cloud.fastreport.model.SubscriptionPeriodVM; +import cloud.fastreport.model.SubscriptionVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -110,4 +114,12 @@ public void exportsFolderTest() { // TODO: test exportsFolder } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/AdminTemplateFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/AdminTemplateFolderCreateVMTest.java index 28c8db3..b57f1a9 100644 --- a/src/test/java/cloud/fastreport/model/AdminTemplateFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/AdminTemplateFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.AdminFolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/CreateDataSourceAdminVMTest.java b/src/test/java/cloud/fastreport/model/CreateDataSourceAdminVMTest.java index 57b9c74..072ecec 100644 --- a/src/test/java/cloud/fastreport/model/CreateDataSourceAdminVMTest.java +++ b/src/test/java/cloud/fastreport/model/CreateDataSourceAdminVMTest.java @@ -13,16 +13,17 @@ package cloud.fastreport.model; +import cloud.fastreport.model.CreateDataSourceVM; import cloud.fastreport.model.DataSourceConnectionType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -73,4 +74,12 @@ public void connectionTypeTest() { // TODO: test connectionType } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/CreateDataSourceVMTest.java b/src/test/java/cloud/fastreport/model/CreateDataSourceVMTest.java index e11d797..8066382 100644 --- a/src/test/java/cloud/fastreport/model/CreateDataSourceVMTest.java +++ b/src/test/java/cloud/fastreport/model/CreateDataSourceVMTest.java @@ -14,9 +14,12 @@ package cloud.fastreport.model; import cloud.fastreport.model.DataSourceConnectionType; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; @@ -73,4 +76,12 @@ public void connectionTypeTest() { // TODO: test connectionType } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/CreateGroupAdminVMTest.java b/src/test/java/cloud/fastreport/model/CreateGroupAdminVMTest.java index 8b851af..284b209 100644 --- a/src/test/java/cloud/fastreport/model/CreateGroupAdminVMTest.java +++ b/src/test/java/cloud/fastreport/model/CreateGroupAdminVMTest.java @@ -13,9 +13,13 @@ package cloud.fastreport.model; +import cloud.fastreport.model.CreateGroupVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; @@ -56,4 +60,12 @@ public void subscriptionIdTest() { // TODO: test subscriptionId } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/CreateGroupVMTest.java b/src/test/java/cloud/fastreport/model/CreateGroupVMTest.java index 5a47268..30da9b2 100644 --- a/src/test/java/cloud/fastreport/model/CreateGroupVMTest.java +++ b/src/test/java/cloud/fastreport/model/CreateGroupVMTest.java @@ -13,9 +13,12 @@ package cloud.fastreport.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import org.openapitools.jackson.nullable.JsonNullable; @@ -56,4 +59,12 @@ public void subscriptionIdTest() { // TODO: test subscriptionId } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ExportCreateAdminVMTest.java b/src/test/java/cloud/fastreport/model/ExportCreateAdminVMTest.java index 0d95c80..89d860b 100644 --- a/src/test/java/cloud/fastreport/model/ExportCreateAdminVMTest.java +++ b/src/test/java/cloud/fastreport/model/ExportCreateAdminVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.ExportCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -75,4 +76,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ExportCreateVMTest.java b/src/test/java/cloud/fastreport/model/ExportCreateVMTest.java index fda4f2c..dcef3ba 100644 --- a/src/test/java/cloud/fastreport/model/ExportCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/ExportCreateVMTest.java @@ -13,9 +13,13 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FileCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -75,4 +79,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ExportFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/ExportFolderCreateVMTest.java index b45b3e6..f529510 100644 --- a/src/test/java/cloud/fastreport/model/ExportFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/ExportFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ExportVMTest.java b/src/test/java/cloud/fastreport/model/ExportVMTest.java index 8e22e26..977482f 100644 --- a/src/test/java/cloud/fastreport/model/ExportVMTest.java +++ b/src/test/java/cloud/fastreport/model/ExportVMTest.java @@ -14,6 +14,9 @@ package cloud.fastreport.model; import cloud.fastreport.model.ExportFormat; +import cloud.fastreport.model.FileStatus; +import cloud.fastreport.model.FileStatusReason; +import cloud.fastreport.model.FileType; import cloud.fastreport.model.FileVM; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -24,6 +27,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -86,6 +92,94 @@ public void editorUserIdTest() { // TODO: test editorUserId } + /** + * Test the property 'name' + */ + @Test + public void nameTest() { + // TODO: test name + } + + /** + * Test the property 'parentId' + */ + @Test + public void parentIdTest() { + // TODO: test parentId + } + + /** + * Test the property 'tags' + */ + @Test + public void tagsTest() { + // TODO: test tags + } + + /** + * Test the property 'icon' + */ + @Test + public void iconTest() { + // TODO: test icon + } + + /** + * Test the property 'type' + */ + @Test + public void typeTest() { + // TODO: test type + } + + /** + * Test the property 'size' + */ + @Test + public void sizeTest() { + // TODO: test size + } + + /** + * Test the property 'subscriptionId' + */ + @Test + public void subscriptionIdTest() { + // TODO: test subscriptionId + } + + /** + * Test the property 'status' + */ + @Test + public void statusTest() { + // TODO: test status + } + + /** + * Test the property 'statusReason' + */ + @Test + public void statusReasonTest() { + // TODO: test statusReason + } + + /** + * Test the property 'errorMessage' + */ + @Test + public void errorMessageTest() { + // TODO: test errorMessage + } + + /** + * Test the property 'isDeleted' + */ + @Test + public void isDeletedTest() { + // TODO: test isDeleted + } + /** * Test the property '$t' */ diff --git a/src/test/java/cloud/fastreport/model/FileCreateVMTest.java b/src/test/java/cloud/fastreport/model/FileCreateVMTest.java index ddab21c..c9a8e8f 100644 --- a/src/test/java/cloud/fastreport/model/FileCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/FileCreateVMTest.java @@ -13,9 +13,12 @@ package cloud.fastreport.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -75,4 +78,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/FileVMTest.java b/src/test/java/cloud/fastreport/model/FileVMTest.java index 9b75c1e..38a2824 100644 --- a/src/test/java/cloud/fastreport/model/FileVMTest.java +++ b/src/test/java/cloud/fastreport/model/FileVMTest.java @@ -13,7 +13,6 @@ package cloud.fastreport.model; -import cloud.fastreport.model.EntityVM; import cloud.fastreport.model.FileStatus; import cloud.fastreport.model.FileStatusReason; import cloud.fastreport.model.FileType; @@ -91,6 +90,94 @@ public void editorUserIdTest() { // TODO: test editorUserId } + /** + * Test the property 'name' + */ + @Test + public void nameTest() { + // TODO: test name + } + + /** + * Test the property 'parentId' + */ + @Test + public void parentIdTest() { + // TODO: test parentId + } + + /** + * Test the property 'tags' + */ + @Test + public void tagsTest() { + // TODO: test tags + } + + /** + * Test the property 'icon' + */ + @Test + public void iconTest() { + // TODO: test icon + } + + /** + * Test the property 'type' + */ + @Test + public void typeTest() { + // TODO: test type + } + + /** + * Test the property 'size' + */ + @Test + public void sizeTest() { + // TODO: test size + } + + /** + * Test the property 'subscriptionId' + */ + @Test + public void subscriptionIdTest() { + // TODO: test subscriptionId + } + + /** + * Test the property 'status' + */ + @Test + public void statusTest() { + // TODO: test status + } + + /** + * Test the property 'statusReason' + */ + @Test + public void statusReasonTest() { + // TODO: test statusReason + } + + /** + * Test the property 'errorMessage' + */ + @Test + public void errorMessageTest() { + // TODO: test errorMessage + } + + /** + * Test the property 'isDeleted' + */ + @Test + public void isDeletedTest() { + // TODO: test isDeleted + } + /** * Test the property '$t' */ diff --git a/src/test/java/cloud/fastreport/model/FolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/FolderCreateVMTest.java index dda6aad..89557d8 100644 --- a/src/test/java/cloud/fastreport/model/FolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/FolderCreateVMTest.java @@ -13,9 +13,12 @@ package cloud.fastreport.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -67,4 +70,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ReportCreateAdminVMTest.java b/src/test/java/cloud/fastreport/model/ReportCreateAdminVMTest.java index 103cfb4..4b2c88a 100644 --- a/src/test/java/cloud/fastreport/model/ReportCreateAdminVMTest.java +++ b/src/test/java/cloud/fastreport/model/ReportCreateAdminVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.ReportCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -75,4 +76,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ReportCreateVMTest.java b/src/test/java/cloud/fastreport/model/ReportCreateVMTest.java index d872427..eee2486 100644 --- a/src/test/java/cloud/fastreport/model/ReportCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/ReportCreateVMTest.java @@ -13,9 +13,13 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FileCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -75,4 +79,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ReportFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/ReportFolderCreateVMTest.java index 7682493..bfe2eeb 100644 --- a/src/test/java/cloud/fastreport/model/ReportFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/ReportFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/ReportVMTest.java b/src/test/java/cloud/fastreport/model/ReportVMTest.java index 1fb1ca1..fcb4291 100644 --- a/src/test/java/cloud/fastreport/model/ReportVMTest.java +++ b/src/test/java/cloud/fastreport/model/ReportVMTest.java @@ -13,6 +13,9 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FileStatus; +import cloud.fastreport.model.FileStatusReason; +import cloud.fastreport.model.FileType; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.ReportInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -24,6 +27,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; import com.fasterxml.jackson.annotation.JsonIgnore; import org.openapitools.jackson.nullable.JsonNullable; @@ -86,6 +92,94 @@ public void editorUserIdTest() { // TODO: test editorUserId } + /** + * Test the property 'name' + */ + @Test + public void nameTest() { + // TODO: test name + } + + /** + * Test the property 'parentId' + */ + @Test + public void parentIdTest() { + // TODO: test parentId + } + + /** + * Test the property 'tags' + */ + @Test + public void tagsTest() { + // TODO: test tags + } + + /** + * Test the property 'icon' + */ + @Test + public void iconTest() { + // TODO: test icon + } + + /** + * Test the property 'type' + */ + @Test + public void typeTest() { + // TODO: test type + } + + /** + * Test the property 'size' + */ + @Test + public void sizeTest() { + // TODO: test size + } + + /** + * Test the property 'subscriptionId' + */ + @Test + public void subscriptionIdTest() { + // TODO: test subscriptionId + } + + /** + * Test the property 'status' + */ + @Test + public void statusTest() { + // TODO: test status + } + + /** + * Test the property 'statusReason' + */ + @Test + public void statusReasonTest() { + // TODO: test statusReason + } + + /** + * Test the property 'errorMessage' + */ + @Test + public void errorMessageTest() { + // TODO: test errorMessage + } + + /** + * Test the property 'isDeleted' + */ + @Test + public void isDeletedTest() { + // TODO: test isDeleted + } + /** * Test the property '$t' */ diff --git a/src/test/java/cloud/fastreport/model/SubscriptionVMTest.java b/src/test/java/cloud/fastreport/model/SubscriptionVMTest.java index b5b58d6..028d96d 100644 --- a/src/test/java/cloud/fastreport/model/SubscriptionVMTest.java +++ b/src/test/java/cloud/fastreport/model/SubscriptionVMTest.java @@ -15,9 +15,12 @@ import cloud.fastreport.model.SubscriptionFolder; import cloud.fastreport.model.SubscriptionPeriodVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; @@ -109,4 +112,12 @@ public void exportsFolderTest() { // TODO: test exportsFolder } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/TemplateCreateAdminVMTest.java b/src/test/java/cloud/fastreport/model/TemplateCreateAdminVMTest.java index 10ac8fc..d287af2 100644 --- a/src/test/java/cloud/fastreport/model/TemplateCreateAdminVMTest.java +++ b/src/test/java/cloud/fastreport/model/TemplateCreateAdminVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.TemplateCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -75,4 +76,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/TemplateCreateVMTest.java b/src/test/java/cloud/fastreport/model/TemplateCreateVMTest.java index fb4ecb1..c83d2c0 100644 --- a/src/test/java/cloud/fastreport/model/TemplateCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/TemplateCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FileCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -75,4 +76,12 @@ public void contentTest() { // TODO: test content } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/TemplateFolderCreateVMTest.java b/src/test/java/cloud/fastreport/model/TemplateFolderCreateVMTest.java index 52afb6a..11f7657 100644 --- a/src/test/java/cloud/fastreport/model/TemplateFolderCreateVMTest.java +++ b/src/test/java/cloud/fastreport/model/TemplateFolderCreateVMTest.java @@ -13,18 +13,19 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FolderCreateVM; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.openapitools.jackson.nullable.JsonNullable; -import java.util.NoSuchElementException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; @@ -67,4 +68,12 @@ public void iconTest() { // TODO: test icon } + /** + * Test the property '$t' + */ + @Test + public void $tTest() { + // TODO: test $t + } + } diff --git a/src/test/java/cloud/fastreport/model/TemplateVMTest.java b/src/test/java/cloud/fastreport/model/TemplateVMTest.java index 04705ef..e8f1fd0 100644 --- a/src/test/java/cloud/fastreport/model/TemplateVMTest.java +++ b/src/test/java/cloud/fastreport/model/TemplateVMTest.java @@ -13,6 +13,9 @@ package cloud.fastreport.model; +import cloud.fastreport.model.FileStatus; +import cloud.fastreport.model.FileStatusReason; +import cloud.fastreport.model.FileType; import cloud.fastreport.model.FileVM; import cloud.fastreport.model.ReportInfo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -24,6 +27,9 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonValue; import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.openapitools.jackson.nullable.JsonNullable; import org.junit.Assert; import org.junit.Ignore; @@ -83,6 +89,94 @@ public void editorUserIdTest() { // TODO: test editorUserId } + /** + * Test the property 'name' + */ + @Test + public void nameTest() { + // TODO: test name + } + + /** + * Test the property 'parentId' + */ + @Test + public void parentIdTest() { + // TODO: test parentId + } + + /** + * Test the property 'tags' + */ + @Test + public void tagsTest() { + // TODO: test tags + } + + /** + * Test the property 'icon' + */ + @Test + public void iconTest() { + // TODO: test icon + } + + /** + * Test the property 'type' + */ + @Test + public void typeTest() { + // TODO: test type + } + + /** + * Test the property 'size' + */ + @Test + public void sizeTest() { + // TODO: test size + } + + /** + * Test the property 'subscriptionId' + */ + @Test + public void subscriptionIdTest() { + // TODO: test subscriptionId + } + + /** + * Test the property 'status' + */ + @Test + public void statusTest() { + // TODO: test status + } + + /** + * Test the property 'statusReason' + */ + @Test + public void statusReasonTest() { + // TODO: test statusReason + } + + /** + * Test the property 'errorMessage' + */ + @Test + public void errorMessageTest() { + // TODO: test errorMessage + } + + /** + * Test the property 'isDeleted' + */ + @Test + public void isDeletedTest() { + // TODO: test isDeleted + } + /** * Test the property '$t' */