From 4c108bb63856b5ca8bd581cfd6bef64bfc1d321b Mon Sep 17 00:00:00 2001 From: MingboPeng Date: Fri, 12 Jan 2024 02:00:32 +0800 Subject: [PATCH] fix(generator): improve generator --- .openapi-generator/.openapi-config.json | 2 +- .openapi-generator/FILES | 386 ++++++++---------- .openapi-generator/generate.py | 16 +- .../templates/csharp/modelGeneric.mustache | 32 +- 4 files changed, 190 insertions(+), 246 deletions(-) diff --git a/.openapi-generator/.openapi-config.json b/.openapi-generator/.openapi-config.json index de7027031..a98d83892 100644 --- a/.openapi-generator/.openapi-config.json +++ b/.openapi-generator/.openapi-config.json @@ -2,7 +2,7 @@ "packageName": "PollinationSDK", "projectName": "PollinationSDK", "packageUrl": "https://github.com/pollination/csharp-sdk", - "packageVersion": "0.23.0", + "packageVersion": "1.1.0", "sourceFolder": "src", "optionalAssemblyInfo": false, "optionalProjectFile": false diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 4292013b2..849f31c43 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -22,30 +22,53 @@ docs/Activation.md docs/ActivationAllOf.md docs/ActivationList.md docs/ActivationListAllOf.md +docs/Application.md +docs/ApplicationAccessPolicy.md +docs/ApplicationAccessPolicyAllOf.md +docs/ApplicationAccessPolicyList.md +docs/ApplicationAccessPolicyListAllOf.md +docs/ApplicationAllOf.md +docs/ApplicationCreate.md +docs/ApplicationCreateAllOf.md +docs/ApplicationDeployment.md +docs/ApplicationDeploymentAllOf.md +docs/ApplicationList.md +docs/ApplicationListAllOf.md +docs/ApplicationPolicySubject.md +docs/ApplicationPolicySubjectAllOf.md +docs/ApplicationSortKey.md +docs/ApplicationUpdate.md +docs/ApplicationUpdateAllOf.md +docs/ApplicationVersion.md +docs/ApplicationVersionAllOf.md +docs/ApplicationVersionList.md +docs/ApplicationVersionListAllOf.md +docs/ApplicationsApi.md docs/ArtifactSource.md docs/ArtifactSourceAllOf.md docs/ArtifactsApi.md docs/BakedRecipe.md docs/BakedRecipeAllOf.md -docs/BaseList.md -docs/BaseListAllOf.md docs/BaseReference.md docs/BaseReferenceAllOf.md docs/BaseStatus.md docs/BaseStatusAllOf.md -docs/BodyPostPluginOwnerPluginsPost.md -docs/BodyPostPluginOwnerPluginsPostAllOf.md +docs/BillingInfo.md +docs/BillingInfoAllOf.md +docs/BillingOption.md +docs/BillingOptionAllOf.md +docs/BodyCythonFunctionOrMethodOwnerPluginsPost.md +docs/BodyCythonFunctionOrMethodOwnerPluginsPostAllOf.md docs/BodyPostRecipeOwnerRecipesPost.md docs/BodyPostRecipeOwnerRecipesPostAllOf.md -docs/CardPublic.md -docs/CardPublicAllOf.md +docs/BuildStatus.md +docs/BuildStatusAllOf.md +docs/BuildStatusEnum.md +docs/CardType.md docs/CloudJob.md docs/CloudJobAllOf.md docs/CloudJobList.md docs/CloudJobListAllOf.md -docs/Coupon.md -docs/CouponAllOf.md -docs/CouponDuration.md docs/CreatedContent.md docs/CreatedContentAllOf.md docs/CryptlexBase.md @@ -146,21 +169,17 @@ docs/DAGTaskLoop.md docs/DAGTaskLoopAllOf.md docs/DailyUsage.md docs/DailyUsageAllOf.md -docs/DeleteSubscriptionItem.md -docs/DeleteSubscriptionItemAllOf.md docs/Dependency.md docs/DependencyAllOf.md docs/DependencyKind.md -docs/Discount.md -docs/DiscountAllOf.md -docs/DiscountAmount.md -docs/DiscountAmountAllOf.md +docs/DeploymentConfig.md +docs/DeploymentConfigAllOf.md docs/DockerConfig.md docs/DockerConfigAllOf.md -docs/ExternalResource.md -docs/ExternalResourceAllOf.md docs/FileMeta.md docs/FileMetaAllOf.md +docs/FileMetaList.md +docs/FileMetaListAllOf.md docs/FileReference.md docs/FileReferenceAllOf.md docs/FolderReference.md @@ -226,17 +245,6 @@ docs/InputReference.md docs/InputReferenceAllOf.md docs/InputReferenceBase.md docs/InputReferenceBaseAllOf.md -docs/Inventory.md -docs/InventoryAllOf.md -docs/Invoice.md -docs/InvoiceAllOf.md -docs/InvoiceList.md -docs/InvoiceListAllOf.md -docs/InvoicePreview.md -docs/InvoicePreviewAllOf.md -docs/InvoiceStatus.md -docs/InvoiceStatusTransitions.md -docs/InvoiceStatusTransitionsAllOf.md docs/ItemReference.md docs/ItemReferenceAllOf.md docs/ItemType.md @@ -272,10 +280,6 @@ docs/LicensePublic.md docs/LicensePublicAllOf.md docs/LicenseType.md docs/LicensesApi.md -docs/LineItem.md -docs/LineItemAllOf.md -docs/LineItemList.md -docs/LineItemListAllOf.md docs/ListResponseMeta.md docs/ListResponseMetaAllOf.md docs/LocalConfig.md @@ -288,12 +292,12 @@ docs/MetaData.md docs/MetaDataAllOf.md docs/Metadata.md docs/MetadataAllOf.md +docs/NewApplicationVersion.md +docs/NewApplicationVersionAllOf.md docs/NewPluginPackage.md docs/NewPluginPackageAllOf.md docs/NewRecipePackage.md docs/NewRecipePackageAllOf.md -docs/NewSubscriptionItem.md -docs/NewSubscriptionItemAllOf.md docs/OpenAPIGenBaseModel.md docs/Organization.md docs/OrganizationAllOf.md @@ -314,18 +318,16 @@ docs/PackageVersion.md docs/PackageVersionAllOf.md docs/PathOutput.md docs/PathOutputAllOf.md -docs/PaymentCreate.md -docs/PaymentCreateAllOf.md -docs/PaymentIntent.md -docs/PaymentIntentAllOf.md -docs/PaymentMethodList.md -docs/PaymentMethodListAllOf.md -docs/PaymentSetup.md -docs/PaymentSetupAllOf.md -docs/PaymentsApi.md -docs/Period.md -docs/PeriodAllOf.md +docs/PausedReason.md +docs/PayLink.md +docs/PayLinkAllOf.md +docs/Payment.md +docs/PaymentAllOf.md +docs/PaymentMethod.md +docs/PaymentMethodAllOf.md +docs/PaymentMethodEnum.md docs/Permission.md +docs/PlanType.md docs/Plugin.md docs/PluginAllOf.md docs/PluginConfig.md @@ -337,19 +339,6 @@ docs/PluginPackageListAllOf.md docs/PluginsApi.md docs/PolicySubject.md docs/PolicySubjectAllOf.md -docs/PollinationSubscription.md -docs/PollinationSubscriptionAllOf.md -docs/Price.md -docs/PriceAllOf.md -docs/PriceRecurrence.md -docs/PriceRecurrenceAllOf.md -docs/PriceTier.md -docs/PriceTierAllOf.md -docs/PriceType.md -docs/Product.md -docs/ProductAllOf.md -docs/ProductFamily.md -docs/ProductFamilyAllOf.md docs/Project.md docs/ProjectAccessPolicy.md docs/ProjectAccessPolicyAllOf.md @@ -376,8 +365,6 @@ docs/PublicAccountList.md docs/PublicAccountListAllOf.md docs/Quota.md docs/QuotaAllOf.md -docs/QuotaExtension.md -docs/QuotaExtensionAllOf.md docs/QuotaList.md docs/QuotaListAllOf.md docs/QuotaPlan.md @@ -420,6 +407,8 @@ docs/RepositoryUserPermissions.md docs/RepositoryUserPermissionsAllOf.md docs/ResourcesDuration.md docs/ResourcesDurationAllOf.md +docs/RetryConfig.md +docs/RetryConfigAllOf.md docs/RoleEnum.md docs/Run.md docs/RunAllOf.md @@ -439,11 +428,9 @@ docs/S3.md docs/S3AllOf.md docs/S3UploadRequest.md docs/S3UploadRequestAllOf.md -docs/SecureResourcePublic.md -docs/SecureResourcePublicAllOf.md +docs/SDKEnum.md +docs/ScriptingLanguages.md docs/SortEnum.md -docs/Status.md -docs/StatusAllOf.md docs/StatusType.md docs/StepArrayInput.md docs/StepArrayInputAllOf.md @@ -487,20 +474,19 @@ docs/StepStringInputAllOf.md docs/StepStringOutput.md docs/StepStringOutputAllOf.md docs/SubjectType.md -docs/Subscribe.md -docs/SubscribeAllOf.md docs/Subscription.md docs/SubscriptionAllOf.md docs/SubscriptionCreate.md docs/SubscriptionCreateAllOf.md -docs/SubscriptionItem.md -docs/SubscriptionItemAllOf.md -docs/SubscriptionItemList.md -docs/SubscriptionItemListAllOf.md +docs/SubscriptionPayment.md +docs/SubscriptionPaymentAllOf.md docs/SubscriptionPlan.md docs/SubscriptionPlanAllOf.md +docs/SubscriptionPlansApi.md docs/SubscriptionUpdate.md docs/SubscriptionUpdateAllOf.md +docs/SubscriptionUpdateDryRun.md +docs/SubscriptionUpdateDryRunAllOf.md docs/SubscriptionsApi.md docs/TaskArgument.md docs/TaskArgumentAllOf.md @@ -538,8 +524,6 @@ docs/TemplateFunction.md docs/TemplateFunctionAllOf.md docs/UpdateAccepted.md docs/UpdateAcceptedAllOf.md -docs/UpdateInvoicePreview.md -docs/UpdateInvoicePreviewAllOf.md docs/Usage.md docs/UsageAllOf.md docs/UserApi.md @@ -567,16 +551,17 @@ docs/ValueReference.md docs/ValueReferenceAllOf.md src/PollinationSDK.Test/Api/APITokensApiTests.cs src/PollinationSDK.Test/Api/AccountsApiTests.cs +src/PollinationSDK.Test/Api/ApplicationsApiTests.cs src/PollinationSDK.Test/Api/ArtifactsApiTests.cs src/PollinationSDK.Test/Api/JobsApiTests.cs src/PollinationSDK.Test/Api/LicensesApiTests.cs src/PollinationSDK.Test/Api/OrgsApiTests.cs -src/PollinationSDK.Test/Api/PaymentsApiTests.cs src/PollinationSDK.Test/Api/PluginsApiTests.cs src/PollinationSDK.Test/Api/ProjectsApiTests.cs src/PollinationSDK.Test/Api/RecipesApiTests.cs src/PollinationSDK.Test/Api/RegistriesApiTests.cs src/PollinationSDK.Test/Api/RunsApiTests.cs +src/PollinationSDK.Test/Api/SubscriptionPlansApiTests.cs src/PollinationSDK.Test/Api/SubscriptionsApiTests.cs src/PollinationSDK.Test/Api/TeamsApiTests.cs src/PollinationSDK.Test/Api/UserApiTests.cs @@ -602,29 +587,51 @@ src/PollinationSDK.Test/Model/ActivationAllOfTests.cs src/PollinationSDK.Test/Model/ActivationListAllOfTests.cs src/PollinationSDK.Test/Model/ActivationListTests.cs src/PollinationSDK.Test/Model/ActivationTests.cs +src/PollinationSDK.Test/Model/ApplicationAccessPolicyAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationAccessPolicyListAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationAccessPolicyListTests.cs +src/PollinationSDK.Test/Model/ApplicationAccessPolicyTests.cs +src/PollinationSDK.Test/Model/ApplicationAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationCreateAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationCreateTests.cs +src/PollinationSDK.Test/Model/ApplicationDeploymentAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationDeploymentTests.cs +src/PollinationSDK.Test/Model/ApplicationListAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationListTests.cs +src/PollinationSDK.Test/Model/ApplicationPolicySubjectAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationPolicySubjectTests.cs +src/PollinationSDK.Test/Model/ApplicationSortKeyTests.cs +src/PollinationSDK.Test/Model/ApplicationTests.cs +src/PollinationSDK.Test/Model/ApplicationUpdateAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationUpdateTests.cs +src/PollinationSDK.Test/Model/ApplicationVersionAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationVersionListAllOfTests.cs +src/PollinationSDK.Test/Model/ApplicationVersionListTests.cs +src/PollinationSDK.Test/Model/ApplicationVersionTests.cs src/PollinationSDK.Test/Model/ArtifactSourceAllOfTests.cs src/PollinationSDK.Test/Model/ArtifactSourceTests.cs src/PollinationSDK.Test/Model/BakedRecipeAllOfTests.cs src/PollinationSDK.Test/Model/BakedRecipeTests.cs -src/PollinationSDK.Test/Model/BaseListAllOfTests.cs -src/PollinationSDK.Test/Model/BaseListTests.cs src/PollinationSDK.Test/Model/BaseReferenceAllOfTests.cs src/PollinationSDK.Test/Model/BaseReferenceTests.cs src/PollinationSDK.Test/Model/BaseStatusAllOfTests.cs src/PollinationSDK.Test/Model/BaseStatusTests.cs -src/PollinationSDK.Test/Model/BodyPostPluginOwnerPluginsPostAllOfTests.cs -src/PollinationSDK.Test/Model/BodyPostPluginOwnerPluginsPostTests.cs +src/PollinationSDK.Test/Model/BillingInfoAllOfTests.cs +src/PollinationSDK.Test/Model/BillingInfoTests.cs +src/PollinationSDK.Test/Model/BillingOptionAllOfTests.cs +src/PollinationSDK.Test/Model/BillingOptionTests.cs +src/PollinationSDK.Test/Model/BodyCythonFunctionOrMethodOwnerPluginsPostAllOfTests.cs +src/PollinationSDK.Test/Model/BodyCythonFunctionOrMethodOwnerPluginsPostTests.cs src/PollinationSDK.Test/Model/BodyPostRecipeOwnerRecipesPostAllOfTests.cs src/PollinationSDK.Test/Model/BodyPostRecipeOwnerRecipesPostTests.cs -src/PollinationSDK.Test/Model/CardPublicAllOfTests.cs -src/PollinationSDK.Test/Model/CardPublicTests.cs +src/PollinationSDK.Test/Model/BuildStatusAllOfTests.cs +src/PollinationSDK.Test/Model/BuildStatusEnumTests.cs +src/PollinationSDK.Test/Model/BuildStatusTests.cs +src/PollinationSDK.Test/Model/CardTypeTests.cs src/PollinationSDK.Test/Model/CloudJobAllOfTests.cs src/PollinationSDK.Test/Model/CloudJobListAllOfTests.cs src/PollinationSDK.Test/Model/CloudJobListTests.cs src/PollinationSDK.Test/Model/CloudJobTests.cs -src/PollinationSDK.Test/Model/CouponAllOfTests.cs -src/PollinationSDK.Test/Model/CouponDurationTests.cs -src/PollinationSDK.Test/Model/CouponTests.cs src/PollinationSDK.Test/Model/CreatedContentAllOfTests.cs src/PollinationSDK.Test/Model/CreatedContentTests.cs src/PollinationSDK.Test/Model/CryptlexBaseAllOfTests.cs @@ -725,20 +732,16 @@ src/PollinationSDK.Test/Model/DAGTaskTests.cs src/PollinationSDK.Test/Model/DAGTests.cs src/PollinationSDK.Test/Model/DailyUsageAllOfTests.cs src/PollinationSDK.Test/Model/DailyUsageTests.cs -src/PollinationSDK.Test/Model/DeleteSubscriptionItemAllOfTests.cs -src/PollinationSDK.Test/Model/DeleteSubscriptionItemTests.cs src/PollinationSDK.Test/Model/DependencyAllOfTests.cs src/PollinationSDK.Test/Model/DependencyKindTests.cs src/PollinationSDK.Test/Model/DependencyTests.cs -src/PollinationSDK.Test/Model/DiscountAllOfTests.cs -src/PollinationSDK.Test/Model/DiscountAmountAllOfTests.cs -src/PollinationSDK.Test/Model/DiscountAmountTests.cs -src/PollinationSDK.Test/Model/DiscountTests.cs +src/PollinationSDK.Test/Model/DeploymentConfigAllOfTests.cs +src/PollinationSDK.Test/Model/DeploymentConfigTests.cs src/PollinationSDK.Test/Model/DockerConfigAllOfTests.cs src/PollinationSDK.Test/Model/DockerConfigTests.cs -src/PollinationSDK.Test/Model/ExternalResourceAllOfTests.cs -src/PollinationSDK.Test/Model/ExternalResourceTests.cs src/PollinationSDK.Test/Model/FileMetaAllOfTests.cs +src/PollinationSDK.Test/Model/FileMetaListAllOfTests.cs +src/PollinationSDK.Test/Model/FileMetaListTests.cs src/PollinationSDK.Test/Model/FileMetaTests.cs src/PollinationSDK.Test/Model/FileReferenceAllOfTests.cs src/PollinationSDK.Test/Model/FileReferenceTests.cs @@ -805,17 +808,6 @@ src/PollinationSDK.Test/Model/InputReferenceAllOfTests.cs src/PollinationSDK.Test/Model/InputReferenceBaseAllOfTests.cs src/PollinationSDK.Test/Model/InputReferenceBaseTests.cs src/PollinationSDK.Test/Model/InputReferenceTests.cs -src/PollinationSDK.Test/Model/InventoryAllOfTests.cs -src/PollinationSDK.Test/Model/InventoryTests.cs -src/PollinationSDK.Test/Model/InvoiceAllOfTests.cs -src/PollinationSDK.Test/Model/InvoiceListAllOfTests.cs -src/PollinationSDK.Test/Model/InvoiceListTests.cs -src/PollinationSDK.Test/Model/InvoicePreviewAllOfTests.cs -src/PollinationSDK.Test/Model/InvoicePreviewTests.cs -src/PollinationSDK.Test/Model/InvoiceStatusTests.cs -src/PollinationSDK.Test/Model/InvoiceStatusTransitionsAllOfTests.cs -src/PollinationSDK.Test/Model/InvoiceStatusTransitionsTests.cs -src/PollinationSDK.Test/Model/InvoiceTests.cs src/PollinationSDK.Test/Model/ItemReferenceAllOfTests.cs src/PollinationSDK.Test/Model/ItemReferenceTests.cs src/PollinationSDK.Test/Model/ItemTypeTests.cs @@ -849,10 +841,6 @@ src/PollinationSDK.Test/Model/LicensePublicAllOfTests.cs src/PollinationSDK.Test/Model/LicensePublicTests.cs src/PollinationSDK.Test/Model/LicenseTests.cs src/PollinationSDK.Test/Model/LicenseTypeTests.cs -src/PollinationSDK.Test/Model/LineItemAllOfTests.cs -src/PollinationSDK.Test/Model/LineItemListAllOfTests.cs -src/PollinationSDK.Test/Model/LineItemListTests.cs -src/PollinationSDK.Test/Model/LineItemTests.cs src/PollinationSDK.Test/Model/ListResponseMetaAllOfTests.cs src/PollinationSDK.Test/Model/ListResponseMetaTests.cs src/PollinationSDK.Test/Model/LocalConfigAllOfTests.cs @@ -863,14 +851,12 @@ src/PollinationSDK.Test/Model/MaintainerAllOfTests.cs src/PollinationSDK.Test/Model/MaintainerTests.cs src/PollinationSDK.Test/Model/MetaDataAllOfTests.cs src/PollinationSDK.Test/Model/MetaDataTests.cs -src/PollinationSDK.Test/Model/MetadataAllOfTests.cs -src/PollinationSDK.Test/Model/MetadataTests.cs +src/PollinationSDK.Test/Model/NewApplicationVersionAllOfTests.cs +src/PollinationSDK.Test/Model/NewApplicationVersionTests.cs src/PollinationSDK.Test/Model/NewPluginPackageAllOfTests.cs src/PollinationSDK.Test/Model/NewPluginPackageTests.cs src/PollinationSDK.Test/Model/NewRecipePackageAllOfTests.cs src/PollinationSDK.Test/Model/NewRecipePackageTests.cs -src/PollinationSDK.Test/Model/NewSubscriptionItemAllOfTests.cs -src/PollinationSDK.Test/Model/NewSubscriptionItemTests.cs src/PollinationSDK.Test/Model/OpenAPIGenBaseModelTests.cs src/PollinationSDK.Test/Model/OrganizationAllOfTests.cs src/PollinationSDK.Test/Model/OrganizationCreateAllOfTests.cs @@ -890,17 +876,16 @@ src/PollinationSDK.Test/Model/PackageVersionAllOfTests.cs src/PollinationSDK.Test/Model/PackageVersionTests.cs src/PollinationSDK.Test/Model/PathOutputAllOfTests.cs src/PollinationSDK.Test/Model/PathOutputTests.cs -src/PollinationSDK.Test/Model/PaymentCreateAllOfTests.cs -src/PollinationSDK.Test/Model/PaymentCreateTests.cs -src/PollinationSDK.Test/Model/PaymentIntentAllOfTests.cs -src/PollinationSDK.Test/Model/PaymentIntentTests.cs -src/PollinationSDK.Test/Model/PaymentMethodListAllOfTests.cs -src/PollinationSDK.Test/Model/PaymentMethodListTests.cs -src/PollinationSDK.Test/Model/PaymentSetupAllOfTests.cs -src/PollinationSDK.Test/Model/PaymentSetupTests.cs -src/PollinationSDK.Test/Model/PeriodAllOfTests.cs -src/PollinationSDK.Test/Model/PeriodTests.cs +src/PollinationSDK.Test/Model/PausedReasonTests.cs +src/PollinationSDK.Test/Model/PayLinkAllOfTests.cs +src/PollinationSDK.Test/Model/PayLinkTests.cs +src/PollinationSDK.Test/Model/PaymentAllOfTests.cs +src/PollinationSDK.Test/Model/PaymentMethodAllOfTests.cs +src/PollinationSDK.Test/Model/PaymentMethodEnumTests.cs +src/PollinationSDK.Test/Model/PaymentMethodTests.cs +src/PollinationSDK.Test/Model/PaymentTests.cs src/PollinationSDK.Test/Model/PermissionTests.cs +src/PollinationSDK.Test/Model/PlanTypeTests.cs src/PollinationSDK.Test/Model/PluginAllOfTests.cs src/PollinationSDK.Test/Model/PluginConfigAllOfTests.cs src/PollinationSDK.Test/Model/PluginConfigTests.cs @@ -911,19 +896,6 @@ src/PollinationSDK.Test/Model/PluginPackageTests.cs src/PollinationSDK.Test/Model/PluginTests.cs src/PollinationSDK.Test/Model/PolicySubjectAllOfTests.cs src/PollinationSDK.Test/Model/PolicySubjectTests.cs -src/PollinationSDK.Test/Model/PollinationSubscriptionAllOfTests.cs -src/PollinationSDK.Test/Model/PollinationSubscriptionTests.cs -src/PollinationSDK.Test/Model/PriceAllOfTests.cs -src/PollinationSDK.Test/Model/PriceRecurrenceAllOfTests.cs -src/PollinationSDK.Test/Model/PriceRecurrenceTests.cs -src/PollinationSDK.Test/Model/PriceTests.cs -src/PollinationSDK.Test/Model/PriceTierAllOfTests.cs -src/PollinationSDK.Test/Model/PriceTierTests.cs -src/PollinationSDK.Test/Model/PriceTypeTests.cs -src/PollinationSDK.Test/Model/ProductAllOfTests.cs -src/PollinationSDK.Test/Model/ProductFamilyAllOfTests.cs -src/PollinationSDK.Test/Model/ProductFamilyTests.cs -src/PollinationSDK.Test/Model/ProductTests.cs src/PollinationSDK.Test/Model/ProjectAccessPolicyAllOfTests.cs src/PollinationSDK.Test/Model/ProjectAccessPolicyListAllOfTests.cs src/PollinationSDK.Test/Model/ProjectAccessPolicyListTests.cs @@ -948,8 +920,6 @@ src/PollinationSDK.Test/Model/ProjectUpdateTests.cs src/PollinationSDK.Test/Model/PublicAccountListAllOfTests.cs src/PollinationSDK.Test/Model/PublicAccountListTests.cs src/PollinationSDK.Test/Model/QuotaAllOfTests.cs -src/PollinationSDK.Test/Model/QuotaExtensionAllOfTests.cs -src/PollinationSDK.Test/Model/QuotaExtensionTests.cs src/PollinationSDK.Test/Model/QuotaListAllOfTests.cs src/PollinationSDK.Test/Model/QuotaListTests.cs src/PollinationSDK.Test/Model/QuotaPlanAllOfTests.cs @@ -991,6 +961,8 @@ src/PollinationSDK.Test/Model/RepositoryUserPermissionsAllOfTests.cs src/PollinationSDK.Test/Model/RepositoryUserPermissionsTests.cs src/PollinationSDK.Test/Model/ResourcesDurationAllOfTests.cs src/PollinationSDK.Test/Model/ResourcesDurationTests.cs +src/PollinationSDK.Test/Model/RetryConfigAllOfTests.cs +src/PollinationSDK.Test/Model/RetryConfigTests.cs src/PollinationSDK.Test/Model/RoleEnumTests.cs src/PollinationSDK.Test/Model/RunAllOfTests.cs src/PollinationSDK.Test/Model/RunListAllOfTests.cs @@ -1009,11 +981,9 @@ src/PollinationSDK.Test/Model/S3AllOfTests.cs src/PollinationSDK.Test/Model/S3Tests.cs src/PollinationSDK.Test/Model/S3UploadRequestAllOfTests.cs src/PollinationSDK.Test/Model/S3UploadRequestTests.cs -src/PollinationSDK.Test/Model/SecureResourcePublicAllOfTests.cs -src/PollinationSDK.Test/Model/SecureResourcePublicTests.cs +src/PollinationSDK.Test/Model/SDKEnumTests.cs +src/PollinationSDK.Test/Model/ScriptingLanguagesTests.cs src/PollinationSDK.Test/Model/SortEnumTests.cs -src/PollinationSDK.Test/Model/StatusAllOfTests.cs -src/PollinationSDK.Test/Model/StatusTests.cs src/PollinationSDK.Test/Model/StatusTypeTests.cs src/PollinationSDK.Test/Model/StepArrayInputAllOfTests.cs src/PollinationSDK.Test/Model/StepArrayInputTests.cs @@ -1057,19 +1027,17 @@ src/PollinationSDK.Test/Model/StepStringInputTests.cs src/PollinationSDK.Test/Model/StepStringOutputAllOfTests.cs src/PollinationSDK.Test/Model/StepStringOutputTests.cs src/PollinationSDK.Test/Model/SubjectTypeTests.cs -src/PollinationSDK.Test/Model/SubscribeAllOfTests.cs -src/PollinationSDK.Test/Model/SubscribeTests.cs src/PollinationSDK.Test/Model/SubscriptionAllOfTests.cs src/PollinationSDK.Test/Model/SubscriptionCreateAllOfTests.cs src/PollinationSDK.Test/Model/SubscriptionCreateTests.cs -src/PollinationSDK.Test/Model/SubscriptionItemAllOfTests.cs -src/PollinationSDK.Test/Model/SubscriptionItemListAllOfTests.cs -src/PollinationSDK.Test/Model/SubscriptionItemListTests.cs -src/PollinationSDK.Test/Model/SubscriptionItemTests.cs +src/PollinationSDK.Test/Model/SubscriptionPaymentAllOfTests.cs +src/PollinationSDK.Test/Model/SubscriptionPaymentTests.cs src/PollinationSDK.Test/Model/SubscriptionPlanAllOfTests.cs src/PollinationSDK.Test/Model/SubscriptionPlanTests.cs src/PollinationSDK.Test/Model/SubscriptionTests.cs src/PollinationSDK.Test/Model/SubscriptionUpdateAllOfTests.cs +src/PollinationSDK.Test/Model/SubscriptionUpdateDryRunAllOfTests.cs +src/PollinationSDK.Test/Model/SubscriptionUpdateDryRunTests.cs src/PollinationSDK.Test/Model/SubscriptionUpdateTests.cs src/PollinationSDK.Test/Model/TaskArgumentAllOfTests.cs src/PollinationSDK.Test/Model/TaskArgumentTests.cs @@ -1106,8 +1074,6 @@ src/PollinationSDK.Test/Model/TemplateFunctionAllOfTests.cs src/PollinationSDK.Test/Model/TemplateFunctionTests.cs src/PollinationSDK.Test/Model/UpdateAcceptedAllOfTests.cs src/PollinationSDK.Test/Model/UpdateAcceptedTests.cs -src/PollinationSDK.Test/Model/UpdateInvoicePreviewAllOfTests.cs -src/PollinationSDK.Test/Model/UpdateInvoicePreviewTests.cs src/PollinationSDK.Test/Model/UsageAllOfTests.cs src/PollinationSDK.Test/Model/UsageTests.cs src/PollinationSDK.Test/Model/UserCreateAllOfTests.cs @@ -1134,16 +1100,17 @@ src/PollinationSDK.Test/Model/ValueReferenceTests.cs src/PollinationSDK.Test/packages.config src/PollinationSDK/Api/APITokensApi.cs src/PollinationSDK/Api/AccountsApi.cs +src/PollinationSDK/Api/ApplicationsApi.cs src/PollinationSDK/Api/ArtifactsApi.cs src/PollinationSDK/Api/JobsApi.cs src/PollinationSDK/Api/LicensesApi.cs src/PollinationSDK/Api/OrgsApi.cs -src/PollinationSDK/Api/PaymentsApi.cs src/PollinationSDK/Api/PluginsApi.cs src/PollinationSDK/Api/ProjectsApi.cs src/PollinationSDK/Api/RecipesApi.cs src/PollinationSDK/Api/RegistriesApi.cs src/PollinationSDK/Api/RunsApi.cs +src/PollinationSDK/Api/SubscriptionPlansApi.cs src/PollinationSDK/Api/SubscriptionsApi.cs src/PollinationSDK/Api/TeamsApi.cs src/PollinationSDK/Api/UserApi.cs @@ -1178,29 +1145,51 @@ src/PollinationSDK/Model/Activation.cs src/PollinationSDK/Model/ActivationAllOf.cs src/PollinationSDK/Model/ActivationList.cs src/PollinationSDK/Model/ActivationListAllOf.cs +src/PollinationSDK/Model/Application.cs +src/PollinationSDK/Model/ApplicationAccessPolicy.cs +src/PollinationSDK/Model/ApplicationAccessPolicyAllOf.cs +src/PollinationSDK/Model/ApplicationAccessPolicyList.cs +src/PollinationSDK/Model/ApplicationAccessPolicyListAllOf.cs +src/PollinationSDK/Model/ApplicationAllOf.cs +src/PollinationSDK/Model/ApplicationCreate.cs +src/PollinationSDK/Model/ApplicationCreateAllOf.cs +src/PollinationSDK/Model/ApplicationDeployment.cs +src/PollinationSDK/Model/ApplicationDeploymentAllOf.cs +src/PollinationSDK/Model/ApplicationList.cs +src/PollinationSDK/Model/ApplicationListAllOf.cs +src/PollinationSDK/Model/ApplicationPolicySubject.cs +src/PollinationSDK/Model/ApplicationPolicySubjectAllOf.cs +src/PollinationSDK/Model/ApplicationSortKey.cs +src/PollinationSDK/Model/ApplicationUpdate.cs +src/PollinationSDK/Model/ApplicationUpdateAllOf.cs +src/PollinationSDK/Model/ApplicationVersion.cs +src/PollinationSDK/Model/ApplicationVersionAllOf.cs +src/PollinationSDK/Model/ApplicationVersionList.cs +src/PollinationSDK/Model/ApplicationVersionListAllOf.cs src/PollinationSDK/Model/ArtifactSource.cs src/PollinationSDK/Model/ArtifactSourceAllOf.cs src/PollinationSDK/Model/BakedRecipe.cs src/PollinationSDK/Model/BakedRecipeAllOf.cs -src/PollinationSDK/Model/BaseList.cs -src/PollinationSDK/Model/BaseListAllOf.cs src/PollinationSDK/Model/BaseReference.cs src/PollinationSDK/Model/BaseReferenceAllOf.cs src/PollinationSDK/Model/BaseStatus.cs src/PollinationSDK/Model/BaseStatusAllOf.cs -src/PollinationSDK/Model/BodyPostPluginOwnerPluginsPost.cs -src/PollinationSDK/Model/BodyPostPluginOwnerPluginsPostAllOf.cs +src/PollinationSDK/Model/BillingInfo.cs +src/PollinationSDK/Model/BillingInfoAllOf.cs +src/PollinationSDK/Model/BillingOption.cs +src/PollinationSDK/Model/BillingOptionAllOf.cs +src/PollinationSDK/Model/BodyCythonFunctionOrMethodOwnerPluginsPost.cs +src/PollinationSDK/Model/BodyCythonFunctionOrMethodOwnerPluginsPostAllOf.cs src/PollinationSDK/Model/BodyPostRecipeOwnerRecipesPost.cs src/PollinationSDK/Model/BodyPostRecipeOwnerRecipesPostAllOf.cs -src/PollinationSDK/Model/CardPublic.cs -src/PollinationSDK/Model/CardPublicAllOf.cs +src/PollinationSDK/Model/BuildStatus.cs +src/PollinationSDK/Model/BuildStatusAllOf.cs +src/PollinationSDK/Model/BuildStatusEnum.cs +src/PollinationSDK/Model/CardType.cs src/PollinationSDK/Model/CloudJob.cs src/PollinationSDK/Model/CloudJobAllOf.cs src/PollinationSDK/Model/CloudJobList.cs src/PollinationSDK/Model/CloudJobListAllOf.cs -src/PollinationSDK/Model/Coupon.cs -src/PollinationSDK/Model/CouponAllOf.cs -src/PollinationSDK/Model/CouponDuration.cs src/PollinationSDK/Model/CreatedContent.cs src/PollinationSDK/Model/CreatedContentAllOf.cs src/PollinationSDK/Model/CryptlexBase.cs @@ -1301,21 +1290,17 @@ src/PollinationSDK/Model/DAGTaskLoop.cs src/PollinationSDK/Model/DAGTaskLoopAllOf.cs src/PollinationSDK/Model/DailyUsage.cs src/PollinationSDK/Model/DailyUsageAllOf.cs -src/PollinationSDK/Model/DeleteSubscriptionItem.cs -src/PollinationSDK/Model/DeleteSubscriptionItemAllOf.cs src/PollinationSDK/Model/Dependency.cs src/PollinationSDK/Model/DependencyAllOf.cs src/PollinationSDK/Model/DependencyKind.cs -src/PollinationSDK/Model/Discount.cs -src/PollinationSDK/Model/DiscountAllOf.cs -src/PollinationSDK/Model/DiscountAmount.cs -src/PollinationSDK/Model/DiscountAmountAllOf.cs +src/PollinationSDK/Model/DeploymentConfig.cs +src/PollinationSDK/Model/DeploymentConfigAllOf.cs src/PollinationSDK/Model/DockerConfig.cs src/PollinationSDK/Model/DockerConfigAllOf.cs -src/PollinationSDK/Model/ExternalResource.cs -src/PollinationSDK/Model/ExternalResourceAllOf.cs src/PollinationSDK/Model/FileMeta.cs src/PollinationSDK/Model/FileMetaAllOf.cs +src/PollinationSDK/Model/FileMetaList.cs +src/PollinationSDK/Model/FileMetaListAllOf.cs src/PollinationSDK/Model/FileReference.cs src/PollinationSDK/Model/FileReferenceAllOf.cs src/PollinationSDK/Model/FolderReference.cs @@ -1381,17 +1366,6 @@ src/PollinationSDK/Model/InputReference.cs src/PollinationSDK/Model/InputReferenceAllOf.cs src/PollinationSDK/Model/InputReferenceBase.cs src/PollinationSDK/Model/InputReferenceBaseAllOf.cs -src/PollinationSDK/Model/Inventory.cs -src/PollinationSDK/Model/InventoryAllOf.cs -src/PollinationSDK/Model/Invoice.cs -src/PollinationSDK/Model/InvoiceAllOf.cs -src/PollinationSDK/Model/InvoiceList.cs -src/PollinationSDK/Model/InvoiceListAllOf.cs -src/PollinationSDK/Model/InvoicePreview.cs -src/PollinationSDK/Model/InvoicePreviewAllOf.cs -src/PollinationSDK/Model/InvoiceStatus.cs -src/PollinationSDK/Model/InvoiceStatusTransitions.cs -src/PollinationSDK/Model/InvoiceStatusTransitionsAllOf.cs src/PollinationSDK/Model/ItemReference.cs src/PollinationSDK/Model/ItemReferenceAllOf.cs src/PollinationSDK/Model/ItemType.cs @@ -1425,10 +1399,6 @@ src/PollinationSDK/Model/LicensePoolUpdateAllOf.cs src/PollinationSDK/Model/LicensePublic.cs src/PollinationSDK/Model/LicensePublicAllOf.cs src/PollinationSDK/Model/LicenseType.cs -src/PollinationSDK/Model/LineItem.cs -src/PollinationSDK/Model/LineItemAllOf.cs -src/PollinationSDK/Model/LineItemList.cs -src/PollinationSDK/Model/LineItemListAllOf.cs src/PollinationSDK/Model/ListResponseMeta.cs src/PollinationSDK/Model/ListResponseMetaAllOf.cs src/PollinationSDK/Model/LocalConfig.cs @@ -1441,12 +1411,12 @@ src/PollinationSDK/Model/MetaData.cs src/PollinationSDK/Model/MetaDataAllOf.cs src/PollinationSDK/Model/Metadata.cs src/PollinationSDK/Model/MetadataAllOf.cs +src/PollinationSDK/Model/NewApplicationVersion.cs +src/PollinationSDK/Model/NewApplicationVersionAllOf.cs src/PollinationSDK/Model/NewPluginPackage.cs src/PollinationSDK/Model/NewPluginPackageAllOf.cs src/PollinationSDK/Model/NewRecipePackage.cs src/PollinationSDK/Model/NewRecipePackageAllOf.cs -src/PollinationSDK/Model/NewSubscriptionItem.cs -src/PollinationSDK/Model/NewSubscriptionItemAllOf.cs src/PollinationSDK/Model/OpenAPIGenBaseModel.cs src/PollinationSDK/Model/Organization.cs src/PollinationSDK/Model/OrganizationAllOf.cs @@ -1466,17 +1436,16 @@ src/PollinationSDK/Model/PackageVersion.cs src/PollinationSDK/Model/PackageVersionAllOf.cs src/PollinationSDK/Model/PathOutput.cs src/PollinationSDK/Model/PathOutputAllOf.cs -src/PollinationSDK/Model/PaymentCreate.cs -src/PollinationSDK/Model/PaymentCreateAllOf.cs -src/PollinationSDK/Model/PaymentIntent.cs -src/PollinationSDK/Model/PaymentIntentAllOf.cs -src/PollinationSDK/Model/PaymentMethodList.cs -src/PollinationSDK/Model/PaymentMethodListAllOf.cs -src/PollinationSDK/Model/PaymentSetup.cs -src/PollinationSDK/Model/PaymentSetupAllOf.cs -src/PollinationSDK/Model/Period.cs -src/PollinationSDK/Model/PeriodAllOf.cs +src/PollinationSDK/Model/PausedReason.cs +src/PollinationSDK/Model/PayLink.cs +src/PollinationSDK/Model/PayLinkAllOf.cs +src/PollinationSDK/Model/Payment.cs +src/PollinationSDK/Model/PaymentAllOf.cs +src/PollinationSDK/Model/PaymentMethod.cs +src/PollinationSDK/Model/PaymentMethodAllOf.cs +src/PollinationSDK/Model/PaymentMethodEnum.cs src/PollinationSDK/Model/Permission.cs +src/PollinationSDK/Model/PlanType.cs src/PollinationSDK/Model/Plugin.cs src/PollinationSDK/Model/PluginAllOf.cs src/PollinationSDK/Model/PluginConfig.cs @@ -1487,19 +1456,6 @@ src/PollinationSDK/Model/PluginPackageList.cs src/PollinationSDK/Model/PluginPackageListAllOf.cs src/PollinationSDK/Model/PolicySubject.cs src/PollinationSDK/Model/PolicySubjectAllOf.cs -src/PollinationSDK/Model/PollinationSubscription.cs -src/PollinationSDK/Model/PollinationSubscriptionAllOf.cs -src/PollinationSDK/Model/Price.cs -src/PollinationSDK/Model/PriceAllOf.cs -src/PollinationSDK/Model/PriceRecurrence.cs -src/PollinationSDK/Model/PriceRecurrenceAllOf.cs -src/PollinationSDK/Model/PriceTier.cs -src/PollinationSDK/Model/PriceTierAllOf.cs -src/PollinationSDK/Model/PriceType.cs -src/PollinationSDK/Model/Product.cs -src/PollinationSDK/Model/ProductAllOf.cs -src/PollinationSDK/Model/ProductFamily.cs -src/PollinationSDK/Model/ProductFamilyAllOf.cs src/PollinationSDK/Model/Project.cs src/PollinationSDK/Model/ProjectAccessPolicy.cs src/PollinationSDK/Model/ProjectAccessPolicyAllOf.cs @@ -1525,8 +1481,6 @@ src/PollinationSDK/Model/PublicAccountList.cs src/PollinationSDK/Model/PublicAccountListAllOf.cs src/PollinationSDK/Model/Quota.cs src/PollinationSDK/Model/QuotaAllOf.cs -src/PollinationSDK/Model/QuotaExtension.cs -src/PollinationSDK/Model/QuotaExtensionAllOf.cs src/PollinationSDK/Model/QuotaList.cs src/PollinationSDK/Model/QuotaListAllOf.cs src/PollinationSDK/Model/QuotaPlan.cs @@ -1567,6 +1521,8 @@ src/PollinationSDK/Model/RepositoryUserPermissions.cs src/PollinationSDK/Model/RepositoryUserPermissionsAllOf.cs src/PollinationSDK/Model/ResourcesDuration.cs src/PollinationSDK/Model/ResourcesDurationAllOf.cs +src/PollinationSDK/Model/RetryConfig.cs +src/PollinationSDK/Model/RetryConfigAllOf.cs src/PollinationSDK/Model/RoleEnum.cs src/PollinationSDK/Model/Run.cs src/PollinationSDK/Model/RunAllOf.cs @@ -1585,11 +1541,9 @@ src/PollinationSDK/Model/S3.cs src/PollinationSDK/Model/S3AllOf.cs src/PollinationSDK/Model/S3UploadRequest.cs src/PollinationSDK/Model/S3UploadRequestAllOf.cs -src/PollinationSDK/Model/SecureResourcePublic.cs -src/PollinationSDK/Model/SecureResourcePublicAllOf.cs +src/PollinationSDK/Model/SDKEnum.cs +src/PollinationSDK/Model/ScriptingLanguages.cs src/PollinationSDK/Model/SortEnum.cs -src/PollinationSDK/Model/Status.cs -src/PollinationSDK/Model/StatusAllOf.cs src/PollinationSDK/Model/StatusType.cs src/PollinationSDK/Model/StepArrayInput.cs src/PollinationSDK/Model/StepArrayInputAllOf.cs @@ -1633,20 +1587,18 @@ src/PollinationSDK/Model/StepStringInputAllOf.cs src/PollinationSDK/Model/StepStringOutput.cs src/PollinationSDK/Model/StepStringOutputAllOf.cs src/PollinationSDK/Model/SubjectType.cs -src/PollinationSDK/Model/Subscribe.cs -src/PollinationSDK/Model/SubscribeAllOf.cs src/PollinationSDK/Model/Subscription.cs src/PollinationSDK/Model/SubscriptionAllOf.cs src/PollinationSDK/Model/SubscriptionCreate.cs src/PollinationSDK/Model/SubscriptionCreateAllOf.cs -src/PollinationSDK/Model/SubscriptionItem.cs -src/PollinationSDK/Model/SubscriptionItemAllOf.cs -src/PollinationSDK/Model/SubscriptionItemList.cs -src/PollinationSDK/Model/SubscriptionItemListAllOf.cs +src/PollinationSDK/Model/SubscriptionPayment.cs +src/PollinationSDK/Model/SubscriptionPaymentAllOf.cs src/PollinationSDK/Model/SubscriptionPlan.cs src/PollinationSDK/Model/SubscriptionPlanAllOf.cs src/PollinationSDK/Model/SubscriptionUpdate.cs src/PollinationSDK/Model/SubscriptionUpdateAllOf.cs +src/PollinationSDK/Model/SubscriptionUpdateDryRun.cs +src/PollinationSDK/Model/SubscriptionUpdateDryRunAllOf.cs src/PollinationSDK/Model/TaskArgument.cs src/PollinationSDK/Model/TaskArgumentAllOf.cs src/PollinationSDK/Model/TaskFileReference.cs @@ -1682,8 +1634,6 @@ src/PollinationSDK/Model/TemplateFunction.cs src/PollinationSDK/Model/TemplateFunctionAllOf.cs src/PollinationSDK/Model/UpdateAccepted.cs src/PollinationSDK/Model/UpdateAcceptedAllOf.cs -src/PollinationSDK/Model/UpdateInvoicePreview.cs -src/PollinationSDK/Model/UpdateInvoicePreviewAllOf.cs src/PollinationSDK/Model/Usage.cs src/PollinationSDK/Model/UsageAllOf.cs src/PollinationSDK/Model/UserCreate.cs diff --git a/.openapi-generator/generate.py b/.openapi-generator/generate.py index 8d832e049..b8e2c9f8d 100644 --- a/.openapi-generator/generate.py +++ b/.openapi-generator/generate.py @@ -12,8 +12,8 @@ # update version -# python3 .openapi-generator/pre_gen_script.py ".openapi-docs/openapi_inheritance.json" -subprocess.call(f"python3 {generator_folder}/pre_gen_script.py {json1}", shell=True) +# python .openapi-generator/pre_gen_script.py ".openapi-docs/openapi_inheritance.json" +subprocess.call(f"python {generator_folder}/pre_gen_script.py {json1}", shell=True) # run openapi tool to generate schema @@ -26,22 +26,22 @@ # post process files -# python3 .openapi-generator/post_gen_script.py ".openapi-docs/openapi_inheritance.json" +# python .openapi-generator/post_gen_script.py ".openapi-docs/openapi_inheritance.json" time.sleep(3) -subprocess.call(f"python3 {generator_folder}/post_gen_script.py {json1}", shell=True) +subprocess.call(f"python {generator_folder}/post_gen_script.py {json1}", shell=True) # update assembly version time.sleep(1) -# python3 .openapi-generator/update_assembly_version.py -subprocess.call(f"python3 {generator_folder}/update_assembly_version.py", shell=True) +# python .openapi-generator/update_assembly_version.py +subprocess.call(f"python {generator_folder}/update_assembly_version.py", shell=True) # remove honeybee files time.sleep(1) -# python3 .openapi-generator/create_interface.py ".openapi-docs/openapi_mapper.json" +# python .openapi-generator/create_interface.py ".openapi-docs/openapi_mapper.json" mapper = os.path.join(doc_folder, 'openapi_mapper.json') -subprocess.call(f"python3 {generator_folder}/create_interface.py {mapper}", shell=True) +subprocess.call(f"python {generator_folder}/create_interface.py {mapper}", shell=True) # test to build the project diff --git a/.openapi-generator/templates/csharp/modelGeneric.mustache b/.openapi-generator/templates/csharp/modelGeneric.mustache index 012a11cdb..7973eba77 100644 --- a/.openapi-generator/templates/csharp/modelGeneric.mustache +++ b/.openapi-generator/templates/csharp/modelGeneric.mustache @@ -24,7 +24,7 @@ {{#description}} /// {{description}} {{/description}} - [DataMember(Name="{{baseName}}", EmitDefaultValue={{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})] + [DataMember(Name="{{baseName}}")] public {{#complexType}}{{{complexType}}}{{/complexType}}{{^complexType}}{{{datatypeWithEnum}}}{{/complexType}}{{^isContainer}}{{^required}}{{^isEnum}}?{{/isEnum}}{{/required}}{{/isContainer}} {{name}} { get; set; } {{#defaultValue}} = {{#isEnum}}{{{datatypeWithEnum}}}Enum""{{{defaultValue}}}""Enum{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}};{{/defaultValue}} {{/isEnum}} {{/vars}} @@ -68,9 +68,9 @@ {{/hasOnlyReadOnly}} public {{classname}} ( - {{#parent}}{{#parentModel}}{{#allVars}}{{^isReadOnly}}{{#required}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/allVars}}{{/parentModel}}{{/parent}}, {{#vars}}{{^isReadOnly}}{{#required}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/vars}}{{#hasRequired}}{{#hasOptional}}, {{/hasOptional}}{{/hasRequired}}// Required parameters - {{#parent}}{{#parentModel}}{{#allVars}}{{^isReadOnly}}{{^required}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{#isEnum}}{{{datatypeWithEnum}}}Enum""{{{defaultValue}}}""Enum{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/defaultValue}}{{^defaultValue}}= default{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/allVars}}{{/parentModel}}{{/parent}}, {{#vars}}{{^isReadOnly}}{{^required}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{#isEnum}}{{{datatypeWithEnum}}}Enum""{{{defaultValue}}}""Enum{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/defaultValue}}{{^defaultValue}}= default{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/vars}}// Optional parameters - ){{#parent}} : base({{#parentModel}}{{#allVars}}{{^isReadOnly}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}: {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/isReadOnly}}{{/allVars}}{{/parentModel}}){{/parent}}// BaseClass + {{#parent}}{{#parentModel}}{{#allVars}}{{^isReadOnly}}{{#required}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/allVars}}{{/parentModel}}{{/parent}}{{#vars}}{{^isReadOnly}}{{#required}}, {{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/vars}}{{#hasRequired}}{{#hasOptional}}, {{/hasOptional}}{{/hasRequired}}// Required parameters + {{#parent}}{{#parentModel}}{{#allVars}}{{^isReadOnly}}{{^required}}{{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{#isEnum}}{{{datatypeWithEnum}}}Enum""{{{defaultValue}}}""Enum{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/defaultValue}}{{^defaultValue}}= default{{/defaultValue}}, {{/required}}{{/isReadOnly}}{{/allVars}}{{/parentModel}}{{/parent}}{{#vars}}{{^isReadOnly}}{{^required}}, {{{datatypeWithEnum}}} {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}{{#defaultValue}} = {{#isEnum}}{{{datatypeWithEnum}}}Enum""{{{defaultValue}}}""Enum{{/isEnum}}{{^isEnum}}{{{defaultValue}}}{{/isEnum}}{{/defaultValue}}{{^defaultValue}}= default{{/defaultValue}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/isReadOnly}}{{/vars}}// Optional parameters + ){{#parent}} : base({{#parentModel}}{{#allVars}}{{^isReadOnly}}{{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}: {{#lambda.camelcase_param}}{{name}}{{/lambda.camelcase_param}}, {{/isReadOnly}}{{/allVars}}{{/parentModel}}){{/parent}}// BaseClass { {{#vars}} {{^isInherited}} @@ -136,9 +136,9 @@ /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// {{#description}} /// {{description}}{{/description}} - [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#defaultValue}}true{{/defaultValue}}{{^defaultValue}}false{{/defaultValue}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]{{#isDate}} + [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}})]{{#isDate}} [JsonConverter(typeof(OpenAPIDateConverter))]{{/isDate}} - public {{{dataType}}} {{name}} { get; protected internal set; } {{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}} + public {{{dataType}}} {{name}} { get; protected set; } {{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}} {{/isReadOnly}} {{/isEnum}} {{/isInherited}} @@ -152,7 +152,7 @@ /// {{^description}}Gets or Sets {{{name}}}{{/description}}{{#description}}{{description}}{{/description}} /// {{#description}} /// {{description}}{{/description}} - [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}}, EmitDefaultValue = {{#vendorExtensions.x-emit-default-value}}true{{/vendorExtensions.x-emit-default-value}}{{^vendorExtensions.x-emit-default-value}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}{{#defaultValue}}true{{/defaultValue}}{{^defaultValue}}false{{/defaultValue}}{{/isNullable}}{{/vendorExtensions.x-emit-default-value}})]{{#isDate}} + [DataMember(Name = "{{baseName}}"{{#required}}, IsRequired = true{{/required}})]{{#isDate}} [JsonConverter(typeof(OpenAPIDateConverter))]{{/isDate}} public {{{dataType}}} {{name}} { get; set; } {{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}} {{/isReadOnly}} @@ -189,7 +189,7 @@ var sb = new StringBuilder(); sb.Append("{{classname}}:\n"); {{#allVars}} - sb.Append(" {{name}}: ").Append({{name}}).Append("\n"); + sb.Append(" {{name}}: ").Append(this.{{name}}).Append("\n"); {{/allVars}} return sb.ToString(); } @@ -255,18 +255,12 @@ { if (input == null) return false; - return {{#vars}}{{#parent}}base.Equals(input) && {{/parent}}{{^isContainer}} + return base.Equals(input) && {{#vars}}{{^isContainer}} + Extension.Equals(this.{{name}}, input.{{name}}){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{#isContainer}} ( this.{{name}} == input.{{name}} || - (this.{{name}} != null && - this.{{name}}.Equals(input.{{name}})) - ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{#isContainer}} - ( - this.{{name}} == input.{{name}} || - this.{{name}} != null && - input.{{name}} != null && - this.{{name}}.SequenceEqual(input.{{name}}) - ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}base.Equals(input){{/parent}}{{^parent}}false{{/parent}}{{/vars}}; + Extension.AllEquals(this.{{name}}, input.{{name}}) + ){{#hasMore}} && {{/hasMore}}{{/isContainer}}{{/vars}}{{^vars}}{{#parent}}{{/parent}}{{^parent}}false{{/parent}}{{/vars}}; } /// @@ -410,7 +404,7 @@ {{^isByteArray}} // {{{name}}} ({{{dataType}}}) pattern Regex regex{{{name}}} = new Regex(@"{{{vendorExtensions.x-regex}}}"{{#vendorExtensions.x-modifiers}}{{#-first}}, {{/-first}}RegexOptions.{{{.}}}{{^-last}} | {{/-last}}{{/vendorExtensions.x-modifiers}}); - if (false == regex{{{name}}}.Match(this.{{{name}}}).Success) + if (this.{{{name}}} != null && false == regex{{{name}}}.Match(this.{{{name}}}).Success) { yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for {{{name}}}, must match a pattern of " + regex{{{name}}}, new [] { "{{{name}}}" }); }