From 897ca71dde61f270909122c9e1d0055ae94b1998 Mon Sep 17 00:00:00 2001 From: Shaun Hirst Date: Sat, 23 May 2026 20:29:05 +0100 Subject: [PATCH 1/2] fix(InlineModelResolver): prevent numbered duplicate models from multi-file OAS 3.1 specs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a multi-file OpenAPI 3.1 spec uses external $ref schemas (e.g. JSON Schema files), the swagger-parser resolves them into shared, mutable Java Schema objects. Between processing passes the parser mutates these shared objects in several ways that cause matchGenerated() to produce false misses, which in turn cause numbered duplicate component schemas to be emitted: * Strips 'type' annotations (e.g. type:"string") from property sub-schemas * Strips 'description' text from shared property sub-schemas * Leaves 'example' set on one $ref usage but absent on another (OAS 3.1 allows 'example' as a $ref sibling) * Stores an explicit 'default: null' in YAML as a Jackson NullNode (a non-null Java object serialised as '"default":null'), while a property with no 'default' keyword at all produces a Java null that the NON_NULL mapper omits — two representations of "no default" that compared unequal These mutations caused matchGenerated() to fail its structural comparison, creating e.g. Flow_Segment_1 alongside Flow_Segment for the TAMS-BBC spec. Changes: 1. IgnoreVolatileFieldsMixIn — extends @JsonIgnoreProperties to strip 'description', 'type', and 'example' at every level of the schema graph when computing the structural signature. 2. computeStructuralSignature() — replaces direct structuralMapper calls. After mixin-based serialisation it parses the JSON tree and removes any "default":null (NullNode) entries before returning the key, making an explicit null default compare equal to an absent default while preserving real non-null defaults (e.g. default:"available"). 3. Pre-populate generatedSignature / generatedStructuralSignature with titled schemas already in components/schemas before flattening begins, so that subsequent inline schemas matching existing ones reuse the existing name rather than receiving a numbered suffix. Only titled schemas are pre-populated: a schema identified only by its YAML key in components/schemas has no inherent identity — two anonymous schemas that share the same properties may be intentionally distinct. 4. deduplicateComponents() — post-flatten safety-net pass that scans components/schemas for titled schemas whose structural signatures match, removes the numbered duplicate (e.g. Flow_Segment_1), and rewrites every $ref throughout paths, webhooks, and component schemas to point to the canonical name. 5. Tests — two new regression tests in InlineModelResolverTest plus a set of multi-file YAML fixtures in src/test/resources/3_0/inline-model- resolver-dedup/ that reproduce the parser-mutation scenario: * resolveInlineModelDeduplicatesWhenParserMutatesPropertyTypes — verifies the structural-hash fallback fires when the parser strips 'type' from string properties of a shared Schema object * deduplicateComponentsRemovesNumberedDuplicateOfTitledSchemaAndRewritesRefs — verifies the post-flatten dedup removes the numbered copy and rewrites all $refs in path responses --- .../codegen/InlineModelResolver.java | 289 +++++++++++++++++- .../codegen/InlineModelResolverTest.java | 227 ++++++++++++++ .../collection-item.yaml | 6 + .../container-mapping.yaml | 8 + .../deletion-request.yaml | 16 + .../inline-model-resolver-dedup/error.yaml | 8 + .../flow-collection.yaml | 13 + .../flow-core.yaml | 8 + .../flow-video.yaml | 9 + .../3_0/inline-model-resolver-dedup/root.yaml | 62 ++++ 10 files changed, 644 insertions(+), 2 deletions(-) create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml create mode 100644 modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index b4d64849060c..b9ed1c9eba38 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -41,6 +41,29 @@ public class InlineModelResolver { private OpenAPI openAPI; private Map addedModels = new HashMap<>(); private Map generatedSignature = new HashMap<>(); + // Structural signature: same as generatedSignature but serialised without 'description' or + // 'type' fields at any level of the schema graph. Used as a fallback when the Swagger Parser + // produces two Schema objects from the same source file that differ only in volatile fields — + // this happens in several ways: + // + // 1. OpenAPI 3.1 $ref + sibling description (valid per JSON Schema 2020-12): the property- + // level description overrides the one in the referenced schema, so the resolved Schema + // object gets a different description from its canonical definition. + // + // 2. The Swagger Parser shares a single resolved Schema object (e.g. uuid.json) across ALL + // usages of that external type. Each property that references it with a sibling + // description overwrites that object's description field in-place, so two Schema objects + // for the same source file end up with different property-level descriptions depending on + // which other usages of the shared type were processed between the two resolutions. + // + // 3. The Swagger Parser additionally strips 'type' annotations (e.g. type:"string") from + // shared Schema object properties between processing passes, so identical schemas can + // appear with and without explicit type fields depending on processing order. + // + // By stripping description and type recursively via a Jackson MixIn (see structuralMapper), + // we get a hash stable across all such variations while still distinguishing schemas with + // genuinely different formats, patterns, property structures, enum values, etc. + private Map generatedStructuralSignature = new HashMap<>(); private Map inlineSchemaNameMapping = new HashMap<>(); private Map inlineSchemaOptions = new HashMap<>(); private Set inlineSchemaNameMappingValues = new HashSet<>(); @@ -51,14 +74,73 @@ public class InlineModelResolver { // structure mapper sorts properties alphabetically on write to ensure models are // serialized consistently for lookup of existing models private static ObjectMapper structureMapper; + // structural mapper is like structureMapper but ignores 'description' and 'type' fields at + // every level of the schema graph (via a MixIn applied to Schema.class and all its subclasses) + private static ObjectMapper structuralMapper; // a set to keep track of names generated for inline schemas private Set uniqueNames = new HashSet<>(); + // MixIn that suppresses volatile fields when any Schema instance is serialised for structural + // comparison. Registered on Schema.class so it applies recursively to all nested Schema + // objects (properties, allOf/anyOf/oneOf items, array items, additionalProperties, etc.). + // Suppressed fields and why: + // - 'description': the Swagger Parser overwrites shared Schema object descriptions in-place + // when resolving $ref + sibling descriptions, and also strips them between passes. + // - 'type': the Swagger Parser strips 'type' annotations (e.g. type:"string") from shared + // Schema object properties between processing passes. + // - 'example': OAS 3.1 allows 'example' as a sibling to '$ref'; different usages of the same + // external schema may carry different (or no) sibling examples, making otherwise identical + // schemas appear structurally different. + @com.fasterxml.jackson.annotation.JsonIgnoreProperties({"description", "type", "example"}) + private abstract static class IgnoreVolatileFieldsMixIn {} + static { structureMapper = Json.mapper().copy(); structureMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); structureMapper.writer(new DefaultPrettyPrinter()); + + structuralMapper = Json.mapper().copy(); + structuralMapper.configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true); + structuralMapper.addMixIn(Schema.class, IgnoreVolatileFieldsMixIn.class); + } + + /** + * Compute a structural signature for a schema, normalising away parser-induced volatile + * differences so that two schema objects that are semantically equal compare as equal. + * + * Beyond what the {@link #structuralMapper} already strips via {@link IgnoreVolatileFieldsMixIn} + * (description, type, example), this method additionally normalises: + *
    + *
  • default: null vs absent default — the Swagger Parser represents an explicit + * {@code default: null} in YAML as a Jackson {@code NullNode} (a non-null Java object + * that the NON_NULL mapper serialises as {@code "default":null}), while a schema + * property with no {@code default} keyword at all results in a Java null (omitted by + * NON_NULL serialisation). Both are semantically "no default"; this method removes any + * {@code "default":null} entry from the JSON tree before returning the signature string. + * Real non-null defaults (e.g. {@code "default":"available"}) are preserved as-is.
    • + *
+ */ + private String computeStructuralSignature(Schema model) throws JsonProcessingException { + String raw = structuralMapper.writeValueAsString(model); + com.fasterxml.jackson.databind.JsonNode tree = structuralMapper.readTree(raw); + removeNullDefaultNodes(tree); + return structuralMapper.writeValueAsString(tree); + } + + /** Recursively remove any {@code "default":null} (NullNode) entries from a JsonNode tree. */ + private static void removeNullDefaultNodes(com.fasterxml.jackson.databind.JsonNode node) { + if (node.isObject()) { + com.fasterxml.jackson.databind.node.ObjectNode obj = + (com.fasterxml.jackson.databind.node.ObjectNode) node; + com.fasterxml.jackson.databind.JsonNode dflt = obj.get("default"); + if (dflt != null && dflt.isNull()) { + obj.remove("default"); + } + node.forEach(InlineModelResolver::removeNullDefaultNodes); + } else if (node.isArray()) { + node.forEach(InlineModelResolver::removeNullDefaultNodes); + } } final Logger LOGGER = LoggerFactory.getLogger(InlineModelResolver.class); @@ -105,10 +187,25 @@ void flatten(OpenAPI openAPI) { this.openAPI.getComponents().setSchemas(new HashMap()); } + // Pre-populate generatedSignature with existing components/schemas entries so that + // matchGenerated() can find them and avoid creating numbered duplicates (e.g. Foo_1) + // when an inline schema with identical content is encountered during flattening. + // Only titled schemas are pre-populated: a schema identified only by its YAML key in + // components/schemas has no inherent identity — two anonymous schemas with the same + // structure may be intentionally distinct (e.g. separate request/response bodies that + // happen to share the same properties). A titled schema (e.g. title: "Container Mapping") + // represents a named type defined in its own file and should be reused wherever referenced. + for (Map.Entry entry : this.openAPI.getComponents().getSchemas().entrySet()) { + if (entry.getValue().getTitle() != null) { + addGenerated(entry.getKey(), entry.getValue()); + } + } + flattenPaths(); flattenWebhooks(); flattenComponents(); flattenComponentResponses(); + deduplicateComponents(); } /** @@ -758,10 +855,17 @@ private String matchGenerated(Schema model) { } try { + // Exact content match. String json = structureMapper.writeValueAsString(model); if (generatedSignature.containsKey(json)) { return generatedSignature.get(json); } + // Structural match: compare with volatile fields stripped at every level. + // See generatedStructuralSignature field for a full explanation of why this is needed. + String structural = computeStructuralSignature(model); + if (generatedStructuralSignature.containsKey(structural)) { + return generatedStructuralSignature.get(structural); + } } catch (JsonProcessingException e) { e.printStackTrace(); } @@ -771,8 +875,8 @@ private String matchGenerated(Schema model) { private void addGenerated(String name, Schema model) { try { - String json = structureMapper.writeValueAsString(model); - generatedSignature.put(json, name); + generatedSignature.put(structureMapper.writeValueAsString(model), name); + generatedStructuralSignature.putIfAbsent(computeStructuralSignature(model), name); } catch (JsonProcessingException e) { e.printStackTrace(); } @@ -1063,4 +1167,185 @@ private String addSchemas(String name, Schema schema) { return name; } + + /** + * Post-flatten deduplication pass: removes titled component schemas that are structural + * duplicates of each other (same title + same structural signature under structuralMapper) + * and rewrites all $refs throughout the spec to point to the canonical (non-numbered) name. + * + * This handles the case where the Swagger Parser shares mutable Schema objects across + * usages of the same external file and mutates their fields (e.g. stripping type or + * description) between processing passes, causing matchGenerated() to miss during flattening + * and producing numbered duplicates like FlowSegment_1 alongside FlowSegment. + */ + private void deduplicateComponents() { + Map schemas = openAPI.getComponents().getSchemas(); + if (schemas == null || schemas.isEmpty()) { + return; + } + + // Sort: non-numbered names first so we always pick them as canonical over numbered ones. + List sortedKeys = new ArrayList<>(schemas.keySet()); + sortedKeys.sort((a, b) -> { + boolean aNumbered = a.matches(".*_\\d+$"); + boolean bNumbered = b.matches(".*_\\d+$"); + if (aNumbered != bNumbered) return aNumbered ? 1 : -1; + return a.compareTo(b); + }); + + // Map: (title + "||" + structural_sig) → first-seen (canonical) name + Map canonicalBySig = new LinkedHashMap<>(); + // Map: duplicate component name → canonical component name + Map duplicateToCanonical = new LinkedHashMap<>(); + + for (String name : sortedKeys) { + Schema schema = schemas.get(name); + if (schema.getTitle() == null) { + continue; // only deduplicate titled schemas — anonymous schemas may be intentionally distinct + } + try { + String structural = computeStructuralSignature(schema); + String sigKey = schema.getTitle() + "||" + structural; + String canonical = canonicalBySig.get(sigKey); + if (canonical != null) { + duplicateToCanonical.put(name, canonical); + } else { + canonicalBySig.put(sigKey, name); + } + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } + + if (duplicateToCanonical.isEmpty()) { + return; + } + + // Build full-path ref replacement map for rewriting + Map refReplacements = new HashMap<>(); + for (Map.Entry entry : duplicateToCanonical.entrySet()) { + refReplacements.put( + "#/components/schemas/" + entry.getKey(), + "#/components/schemas/" + entry.getValue()); + } + + // Remove duplicate schemas from components + for (String duplicate : duplicateToCanonical.keySet()) { + schemas.remove(duplicate); + LOGGER.info("Removed duplicate component schema '{}' (structural duplicate of '{}')", + duplicate, duplicateToCanonical.get(duplicate)); + } + + // Rewrite all $refs in remaining component schemas + for (Schema schema : schemas.values()) { + rewriteSchemaRefs(schema, refReplacements); + } + + // Rewrite all $refs in paths + if (openAPI.getPaths() != null) { + for (PathItem pathItem : openAPI.getPaths().values()) { + rewritePathItemRefs(pathItem, refReplacements); + } + } + + // Rewrite all $refs in webhooks + if (openAPI.getWebhooks() != null) { + for (PathItem pathItem : openAPI.getWebhooks().values()) { + rewritePathItemRefs(pathItem, refReplacements); + } + } + } + + /** + * Recursively rewrites $ref values in a Schema (and all nested schemas) according to + * the refReplacements map (full-path refs: "#/components/schemas/Old" → "#/components/schemas/New"). + */ + @SuppressWarnings({"rawtypes", "unchecked"}) + private void rewriteSchemaRefs(Schema schema, Map refReplacements) { + if (schema == null) { + return; + } + if (schema.get$ref() != null) { + String replacement = refReplacements.get(schema.get$ref()); + if (replacement != null) { + schema.set$ref(replacement); + } + } + if (schema.getProperties() != null) { + for (Object prop : schema.getProperties().values()) { + rewriteSchemaRefs((Schema) prop, refReplacements); + } + } + if (schema.getItems() != null) { + rewriteSchemaRefs(schema.getItems(), refReplacements); + } + if (schema.getAllOf() != null) { + for (Object s : schema.getAllOf()) { + rewriteSchemaRefs((Schema) s, refReplacements); + } + } + if (schema.getAnyOf() != null) { + for (Object s : schema.getAnyOf()) { + rewriteSchemaRefs((Schema) s, refReplacements); + } + } + if (schema.getOneOf() != null) { + for (Object s : schema.getOneOf()) { + rewriteSchemaRefs((Schema) s, refReplacements); + } + } + if (schema.getNot() != null) { + rewriteSchemaRefs(schema.getNot(), refReplacements); + } + if (schema.getAdditionalProperties() instanceof Schema) { + rewriteSchemaRefs((Schema) schema.getAdditionalProperties(), refReplacements); + } + } + + /** + * Rewrites $refs in all operations reachable from a PathItem (request bodies, parameters, + * responses, and nested callbacks). + */ + private void rewritePathItemRefs(PathItem pathItem, Map refReplacements) { + if (pathItem == null) { + return; + } + // Path-level parameters + if (pathItem.getParameters() != null) { + for (Parameter p : pathItem.getParameters()) { + rewriteSchemaRefs(p.getSchema(), refReplacements); + } + } + // Operations + for (Operation operation : pathItem.readOperations()) { + if (operation.getParameters() != null) { + for (Parameter p : operation.getParameters()) { + rewriteSchemaRefs(p.getSchema(), refReplacements); + } + } + RequestBody requestBody = operation.getRequestBody(); + if (requestBody != null && requestBody.getContent() != null) { + for (MediaType mediaType : requestBody.getContent().values()) { + rewriteSchemaRefs(mediaType.getSchema(), refReplacements); + } + } + ApiResponses responses = operation.getResponses(); + if (responses != null) { + for (ApiResponse response : responses.values()) { + if (response.getContent() != null) { + for (MediaType mediaType : response.getContent().values()) { + rewriteSchemaRefs(mediaType.getSchema(), refReplacements); + } + } + } + } + if (operation.getCallbacks() != null) { + for (Callback callback : operation.getCallbacks().values()) { + for (PathItem callbackPathItem : callback.values()) { + rewritePathItemRefs(callbackPathItem, refReplacements); + } + } + } + } + } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index 0670942f8fd0..61bf18b51b11 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -22,6 +22,7 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.PathItem; +import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.media.*; import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.parameters.RequestBody; @@ -175,6 +176,125 @@ public void resolveInlineModel2EqualInnerModels() { assertNull(duplicateAddress); } + @Test + public void resolveInlineModelDeduplicatesAgainstExistingComponentSchema() { + // When a pre-existing components/schemas entry has the same title and content as an + // inline schema encountered during flattening, the inline schema should reuse the + // pre-existing name rather than being registered as a numbered variant (e.g. Foo_1). + // Regression test for: external $ref chains producing ContainerMapping + ContainerMapping_1. + OpenAPI openapi = new OpenAPI(); + openapi.setComponents(new Components()); + + // Pre-existing named schema registered directly in components + openapi.getComponents().addSchemas("ContainerMapping", new ObjectSchema() + .title("ContainerMapping") + .description("Describes the mapping of essence from a container") + .addProperty("track_index", new IntegerSchema())); + + // Schema whose inline property content is identical to the pre-existing ContainerMapping + openapi.getComponents().addSchemas("FlowCore", new ObjectSchema() + .name("FlowCore") + .addProperty("container_mapping", new ObjectSchema() + .title("ContainerMapping") + .description("Describes the mapping of essence from a container") + .addProperty("track_index", new IntegerSchema()))); + + new InlineModelResolver().flatten(openapi); + + // The pre-existing entry must still exist + assertNotNull(openapi.getComponents().getSchemas().get("ContainerMapping")); + // No numbered duplicate should have been created + assertNull(openapi.getComponents().getSchemas().get("ContainerMapping_1")); + } + + @Test + public void resolveInlineModelDeduplicatesAcrossExternalRefChains() { + // Regression test: same external schema referenced from two schemas (one via plain $ref, + // one via $ref + sibling description as allowed in OpenAPI 3.1) must not produce a + // duplicate numbered model (Container_Mapping_1). + ParseOptions parseOptions = new ParseOptions(); + parseOptions.setResolve(true); + parseOptions.setResolveResponses(true); + OpenAPI openAPI = new OpenAPIParser().readLocation( + "src/test/resources/3_0/inline-model-resolver-dedup/root.yaml", + null, parseOptions).getOpenAPI(); + new InlineModelResolver().flatten(openAPI); + + Map schemas = openAPI.getComponents().getSchemas(); + assertNotNull(schemas.get("Container_Mapping")); + assertNull("Duplicate Container_Mapping_1 must not exist", schemas.get("Container_Mapping_1")); + } + + @Test + public void resolveInlineModelDeduplicatesWhenParserMutatesPropertyDescriptions() { + // Regression test: when the Swagger Parser shares and mutates resolved Schema objects + // (e.g. a shared uuid.json resolved Schema has its description overwritten by whichever + // property referencing it was last processed), two Schema objects from the same external + // file may end up with different serialised JSON despite being structurally identical. + // The structural-hash fallback in matchGenerated() (serialised without any 'description' + // fields at any level) must still deduplicate them rather than creating a numbered variant. + OpenAPI openapi = new OpenAPI(); + openapi.setComponents(new Components()); + openapi.setPaths(new Paths()); + + // Schema A: properties have "correct" descriptions (as the file author wrote them) + Schema widgetA = new ObjectSchema() + .title("Widget") + .description("A reusable widget") + .addProperty("id", new StringSchema().description("Widget identifier")) + .addProperty("name", new StringSchema().description("Widget name")); + + // Schema B: same title/description/property-names, but 'id' has a DIFFERENT description + // (simulating what the Swagger Parser does when it shares and mutates a resolved sub-schema) + Schema widgetB = new ObjectSchema() + .title("Widget") + .description("A reusable widget") + .addProperty("id", new StringSchema().description("MUTATED description from another schema")) + .addProperty("name", new StringSchema().description("Widget name")); + + ApiResponse responseA = new ApiResponse() + .description("OK") + .content(new Content().addMediaType("application/json", + new MediaType().schema(widgetA))); + ApiResponse responseB = new ApiResponse() + .description("OK") + .content(new Content().addMediaType("application/json", + new MediaType().schema(widgetB))); + + openapi.getPaths() + .addPathItem("/a", new PathItem().get( + new Operation().operationId("getA").responses(new ApiResponses().addApiResponse("200", responseA)))) + .addPathItem("/b", new PathItem().get( + new Operation().operationId("getB").responses(new ApiResponses().addApiResponse("200", responseB)))); + + new InlineModelResolver().flatten(openapi); + + Map schemas = openapi.getComponents().getSchemas(); + assertNotNull("Widget schema must exist", schemas.get("Widget")); + assertNull("Duplicate Widget_1 must not exist — shape-fingerprint dedup must fire", schemas.get("Widget_1")); + } + + @Test + public void resolveInlineModelDeduplicatesMultipleRefsToSameExternalFile() { + // Regression test: when the same external schema file is referenced from three separate + // paths (simulating DeletionRequest appearing multiple times in the TAMS spec), the parser + // may share the same Java Schema object across all three references. After the first + // processing mutates the object (inline sub-schemas replaced with $refs), subsequent + // encounters hash differently. The identity-based fast path in matchGenerated() must + // recognise the same object reference and avoid registering a numbered duplicate. + ParseOptions parseOptions = new ParseOptions(); + parseOptions.setResolve(true); + parseOptions.setResolveResponses(true); + OpenAPI openAPI = new OpenAPIParser().readLocation( + "src/test/resources/3_0/inline-model-resolver-dedup/root.yaml", + null, parseOptions).getOpenAPI(); + new InlineModelResolver().flatten(openAPI); + + Map schemas = openAPI.getComponents().getSchemas(); + assertNotNull(schemas.get("Deletion_Request")); + assertNull("Duplicate Deletion_Request_1 must not exist", schemas.get("Deletion_Request_1")); + } + @Test public void resolveInlineModel2DifferentInnerModelsWithSameTitle() { OpenAPI openapi = new OpenAPI(); @@ -1205,4 +1325,111 @@ public void doNotWrapSingleAllOfRefs() { assertNotNull(allOfRefWithDescriptionAndReadonly.getAllOf()); assertEquals(numberRangeRef, ((Schema) allOfRefWithDescriptionAndReadonly.getAllOf().get(0)).get$ref()); } + + @Test + public void resolveInlineModelDeduplicatesWhenParserMutatesPropertyTypes() { + // Regression test: the Swagger Parser shares a single resolved Schema object across all + // usages of an external type (e.g. storage-backend.json) and strips the 'type' field + // from its properties between processing passes. The first usage sees properties with + // type:"string"; the second usage sees the same object but with type stripped to null. + // IgnoreVolatileFieldsMixIn now strips 'type' in addition to 'description', so the + // structural-hash fallback in matchGenerated() must still unify them rather than creating + // a numbered variant. + OpenAPI openapi = new OpenAPI(); + openapi.setComponents(new Components()); + openapi.setPaths(new Paths()); + + // First inline schema: properties carry explicit type annotations (as delivered by the + // parser on first encounter of the shared external schema object) + StringSchema prop1First = new StringSchema(); + prop1First.setDescription("The store type"); + StringSchema prop2First = new StringSchema(); + prop2First.setDescription("The provider"); + Schema schemaFirstPass = new ObjectSchema() + .title("StorageBackend") + .description("A storage backend") + .addProperty("store_type", prop1First) + .addProperty("provider", prop2First); + + // Second inline schema: same structure but 'type' has been stripped from properties, + // simulating the Swagger Parser mutating the shared resolved Schema object between passes. + StringSchema prop1Second = new StringSchema(); + prop1Second.setType(null); // simulate parser stripping the type field + prop1Second.setDescription("The store type"); + StringSchema prop2Second = new StringSchema(); + prop2Second.setType(null); + prop2Second.setDescription("The provider"); + Schema schemaSecondPass = new ObjectSchema() + .title("StorageBackend") + .description("A storage backend") + .addProperty("store_type", prop1Second) + .addProperty("provider", prop2Second); + + openapi.getPaths() + .addPathItem("/a", new PathItem().get(new Operation().operationId("getA") + .responses(new ApiResponses().addApiResponse("200", new ApiResponse() + .description("OK") + .content(new Content().addMediaType("application/json", + new MediaType().schema(schemaFirstPass))))))) + .addPathItem("/b", new PathItem().get(new Operation().operationId("getB") + .responses(new ApiResponses().addApiResponse("200", new ApiResponse() + .description("OK") + .content(new Content().addMediaType("application/json", + new MediaType().schema(schemaSecondPass))))))); + + new InlineModelResolver().flatten(openapi); + + Map schemas = openapi.getComponents().getSchemas(); + assertNotNull("StorageBackend schema must exist", schemas.get("StorageBackend")); + assertNull("Duplicate StorageBackend_1 must not exist — type-stripped structural match must fire", + schemas.get("StorageBackend_1")); + } + + @Test + public void deduplicateComponentsRemovesNumberedDuplicateOfTitledSchemaAndRewritesRefs() { + // Regression test: when flattening creates a numbered duplicate of a titled component + // (e.g. FlowSegment_1 alongside FlowSegment) because matchGenerated() missed the match + // due to T0-vs-T1 pre-populate timing, deduplicateComponents() must remove the duplicate + // and rewrite all $refs to it throughout the spec so the generated code only contains one + // class. + OpenAPI openapi = new OpenAPI(); + openapi.setComponents(new Components()); + openapi.setPaths(new Paths()); + + Schema canonical = new ObjectSchema() + .title("Widget") + .description("A widget") + .addProperty("name", new StringSchema()); + + // Duplicate: same title and structure — simulates what flatten() can produce when the + // pre-populate T0 signature no longer matches the T1 form of the same inline schema. + Schema duplicate = new ObjectSchema() + .title("Widget") + .description("A widget") + .addProperty("name", new StringSchema()); + + openapi.getComponents().addSchemas("Widget", canonical); + openapi.getComponents().addSchemas("Widget_1", duplicate); + + // Path whose response references the numbered duplicate + openapi.getPaths().addPathItem("/widgets", new PathItem().get( + new Operation().operationId("getWidget").responses( + new ApiResponses().addApiResponse("200", new ApiResponse() + .description("OK") + .content(new Content().addMediaType("application/json", + new MediaType().schema(new Schema<>() + .$ref("#/components/schemas/Widget_1")))))))); + + new InlineModelResolver().flatten(openapi); + + Map schemas = openapi.getComponents().getSchemas(); + assertNotNull("Canonical Widget must survive deduplication", schemas.get("Widget")); + assertNull("Duplicate Widget_1 must be removed by deduplicateComponents()", schemas.get("Widget_1")); + + // The $ref in the path response must have been rewritten to the canonical name + Schema responseSchema = openapi.getPaths().get("/widgets").getGet() + .getResponses().get("200").getContent().get("application/json").getSchema(); + assertEquals("$ref must be rewritten from Widget_1 to Widget", + "#/components/schemas/Widget", responseSchema.get$ref()); + } } diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml new file mode 100644 index 000000000000..3be5565719e8 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/collection-item.yaml @@ -0,0 +1,6 @@ +title: Collection Item +description: An item in a collection +type: object +properties: + id: + type: string diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml new file mode 100644 index 000000000000..5a5e6f70f2f6 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/container-mapping.yaml @@ -0,0 +1,8 @@ +title: Container Mapping +description: Defines the location of Flow essence data in a container track +type: object +properties: + track_index: + description: A zero-based track index + type: integer + minimum: 0 diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml new file mode 100644 index 000000000000..0b91393973f6 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/deletion-request.yaml @@ -0,0 +1,16 @@ +title: Deletion Request +description: Describes an ongoing deletion request +type: object +required: + - id + - status +properties: + id: + type: string + format: uuid + status: + type: string + enum: [created, done] + error: + description: Provides more information for the error status + $ref: error.yaml diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml new file mode 100644 index 000000000000..59a45650826e --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/error.yaml @@ -0,0 +1,8 @@ +title: Error +description: An API error response +type: object +properties: + code: + type: integer + message: + type: string diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml new file mode 100644 index 000000000000..fec7c44146f3 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-collection.yaml @@ -0,0 +1,13 @@ +title: Flow Collection +description: A collection of flows +type: array +items: + type: object + title: Flow Collection Item + allOf: + - $ref: collection-item.yaml + - type: object + properties: + container_mapping: + description: Describes the mapping of the Flow essence from this collection's container + $ref: container-mapping.yaml diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml new file mode 100644 index 000000000000..7b1ecda9c23d --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-core.yaml @@ -0,0 +1,8 @@ +title: Flow Core +description: Core flow properties +type: object +properties: + id: + type: string + container_mapping: + $ref: container-mapping.yaml diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml new file mode 100644 index 000000000000..d93c6e99917f --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/flow-video.yaml @@ -0,0 +1,9 @@ +title: Video Flow +description: A video flow +type: object +allOf: + - $ref: flow-core.yaml + - type: object + properties: + format: + type: string diff --git a/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml new file mode 100644 index 000000000000..f1b105be1a5b --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_0/inline-model-resolver-dedup/root.yaml @@ -0,0 +1,62 @@ +openapi: "3.1.0" +info: + title: Dedup Test + version: "1.0" +paths: + /flows: + get: + operationId: getFlows + responses: + "200": + description: OK + content: + application/json: + schema: + type: array + items: + $ref: flow-video.yaml + /flow-collections: + get: + operationId: getFlowCollections + responses: + "200": + description: OK + content: + application/json: + schema: + type: array + items: + $ref: flow-collection.yaml + /deletions/{id}: + get: + operationId: getDeletion + responses: + "200": + description: OK + content: + application/json: + schema: + $ref: deletion-request.yaml + /deletions/{id}/status: + get: + operationId: getDeletionStatus + responses: + "200": + description: OK + content: + application/json: + schema: + $ref: deletion-request.yaml + /deletions: + get: + operationId: listDeletions + responses: + "200": + description: OK + content: + application/json: + schema: + type: array + items: + $ref: deletion-request.yaml +components: {} From 1214fd1cfaeea02672257fea72cf3c6a2070c4e9 Mon Sep 17 00:00:00 2001 From: Shaun Hirst Date: Sat, 23 May 2026 20:31:17 +0100 Subject: [PATCH 2/2] chore(samples): regenerate affected samples after InlineModelResolver deduplication fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regenerated all samples via bin/generate-samples.sh (maven:3.9-eclipse-temurin-11, matching CI JDK version) to reflect the corrected InlineModelResolver behaviour introduced in the two preceding commits. Affected generators and the root cause for each change: csharp-generichost (FormModels, net4.7/4.8/8/9/10) TestEnumParametersEnumHeaderStringParameter removed; enum_header_string and enum_query_string parameters now typed as TestEnumParametersRequestEnumFormString. Reason: the header-string and query-string inline enums are structurally identical to the form-string enum; the structural deduplication map (ignoring description fields) now correctly merges them instead of generating a numbered duplicate. python / python-aiohttp / python-httpx / python-lazyImports / python-pydantic-v1 / python-pydantic-v1-aiohttp UploadFileWithAdditionalPropertiesRequestObject removed; the upload_file_with_ additional_properties endpoint's object parameter is now typed as TestObjectForMultipartRequestsRequestMarker. Reason: same structural-deduplication fix — the inline request schema is structurally identical to the pre-existing TestObjectForMultipartRequestsRequestMarker component and is now correctly reused rather than generating a new model class. php-laravel FakeApiInterface / FakeController updated to reflect the merged type names for both enum and upload-object parameters. rust-server / rust-server-deprecated (petstore-with-fake-endpoints-models-for-testing) TestEnumParametersEnumHeaderStringParameter model and all usages replaced with TestEnumParametersRequestEnumFormString across models.rs, cli.rs, client/mod.rs, server/mod.rs, and example files. openapi.yaml inlined schemas updated accordingly. No functional change — the generated clients/servers remain equivalent; only the model class names for previously-duplicate anonymous schemas have been normalised. --- .../net10/FormModels/.openapi-generator/FILES | 2 - .../net10/FormModels/api/openapi.yaml | 11 +- .../net10/FormModels/docs/apis/FakeApi.md | 6 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 18 +-- .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../Client/HostConfiguration.cs | 2 - .../FormModels/.openapi-generator/FILES | 2 - .../net4.7/FormModels/api/openapi.yaml | 11 +- .../net4.7/FormModels/docs/apis/FakeApi.md | 6 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 18 +-- .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../Client/HostConfiguration.cs | 2 - .../FormModels/.openapi-generator/FILES | 2 - .../net4.8/FormModels/api/openapi.yaml | 11 +- .../net4.8/FormModels/docs/apis/FakeApi.md | 6 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 18 +-- .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../Client/HostConfiguration.cs | 2 - .../net8/FormModels/.openapi-generator/FILES | 2 - .../net8/FormModels/api/openapi.yaml | 11 +- .../net8/FormModels/docs/apis/FakeApi.md | 6 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 18 +-- .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../Client/HostConfiguration.cs | 2 - .../net9/FormModels/.openapi-generator/FILES | 2 - .../net9/FormModels/api/openapi.yaml | 11 +- .../net9/FormModels/docs/apis/FakeApi.md | 6 +- .../src/Org.OpenAPITools/Api/FakeApi.cs | 18 +-- .../Org.OpenAPITools/Client/ClientUtils.cs | 2 - .../Client/HostConfiguration.cs | 2 - .../python-aiohttp/.openapi-generator/FILES | 2 - .../client/petstore/python-aiohttp/README.md | 1 - .../petstore/python-aiohttp/docs/FakeApi.md | 6 +- .../python-aiohttp/petstore_api/__init__.py | 2 - .../petstore_api/api/fake_api.py | 13 +- .../petstore_api/models/__init__.py | 1 - .../python-httpx/.openapi-generator/FILES | 2 - .../client/petstore/python-httpx/README.md | 1 - .../petstore/python-httpx/docs/FakeApi.md | 6 +- .../python-httpx/petstore_api/__init__.py | 2 - .../python-httpx/petstore_api/api/fake_api.py | 13 +- .../petstore_api/models/__init__.py | 1 - .../.openapi-generator/FILES | 2 - .../petstore/python-lazyImports/README.md | 1 - .../python-lazyImports/docs/FakeApi.md | 6 +- .../petstore_api/__init__.py | 3 - .../petstore_api/api/fake_api.py | 13 +- .../petstore_api/models/__init__.py | 2 - .../.openapi-generator/FILES | 2 - .../python-pydantic-v1-aiohttp/README.md | 1 - .../docs/FakeApi.md | 6 +- .../petstore_api/__init__.py | 2 - .../petstore_api/api/fake_api.py | 9 +- .../petstore_api/models/__init__.py | 1 - .../.openapi-generator/FILES | 2 - .../petstore/python-pydantic-v1/README.md | 1 - .../python-pydantic-v1/docs/FakeApi.md | 6 +- .../petstore_api/__init__.py | 2 - .../petstore_api/api/fake_api.py | 9 +- .../petstore_api/models/__init__.py | 1 - .../petstore/python/.openapi-generator/FILES | 2 - .../openapi3/client/petstore/python/README.md | 1 - .../client/petstore/python/docs/FakeApi.md | 6 +- .../petstore/python/petstore_api/__init__.py | 2 - .../python/petstore_api/api/fake_api.py | 13 +- .../python/petstore_api/models/__init__.py | 1 - .../php-laravel/.openapi-generator/FILES | 1 - .../php-laravel/Api/FakeApiInterface.php | 8 +- .../Http/Controllers/FakeController.php | 4 +- .../.openapi-generator/FILES | 1 - .../README.md | 1 - .../api/openapi.yaml | 11 +- .../bin/cli.rs | 4 +- .../examples/client/main.rs | 4 +- .../examples/server/server.rs | 4 +- .../src/client/mod.rs | 4 +- .../src/lib.rs | 12 +- .../src/models.rs | 126 ----------------- .../src/server/mod.rs | 4 +- .../.openapi-generator/FILES | 1 - .../README.md | 1 - .../api/openapi.yaml | 11 +- .../bin/cli.rs | 8 +- .../examples/client/main.rs | 4 +- .../examples/server/server.rs | 4 +- .../src/client/mod.rs | 4 +- .../src/lib.rs | 12 +- .../src/models.rs | 127 ------------------ .../src/server/mod.rs | 4 +- 89 files changed, 164 insertions(+), 545 deletions(-) diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES index 737d53400248..cacee1eafc1b 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/.openapi-generator/FILES @@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md docs/models/TestDescendants.md docs/models/TestDescendantsObjectType.md -docs/models/TestEnumParametersEnumHeaderStringParameter.md docs/models/TestEnumParametersEnumQueryDoubleParameter.md docs/models/TestEnumParametersEnumQueryIntegerParameter.md docs/models/TestEnumParametersRequestEnumFormString.md @@ -290,7 +289,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/TestDescendants.cs src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs -src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml index 6dae7b5ccbd3..8e6e916f99eb 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml @@ -772,7 +772,7 @@ paths: name: enum_header_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: simple - description: Query parameter enum test (string array) explode: true @@ -790,7 +790,7 @@ paths: name: enum_query_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: form - description: Query parameter enum test (double) explode: true @@ -2819,13 +2819,6 @@ components: enum_form_string: $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" type: object - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md index 0febc3875e97..abf12b49fbf0 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/docs/apis/FakeApi.md @@ -483,7 +483,7 @@ void (empty response body) # **TestEnumParameters** -> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List enumQueryStringArray = null) +> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List enumQueryStringArray = null) To test enum parameters @@ -496,11 +496,11 @@ To test enum parameters |------|------|-------------|-------| | **enumFormString** | **TestEnumParametersRequestEnumFormString** | | [optional] | | **enumFormStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional] | -| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional] | +| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional] | | **enumHeaderStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional] | | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional] | | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional] | -| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional] | +| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional] | | **enumQueryStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional] | ### Return type diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 6638ec4068d1..53ad97cbc3c1 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -373,7 +373,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// To test enum parameters @@ -391,7 +391,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// Fake endpoint to test group parameters (optional) @@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); } - partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); + partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); /// /// Validates the request parameters @@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option /// /// - private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// Logs exceptions that occur while retrieving the server response @@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// /// /// - partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// To test enum parameters To test enum parameters @@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { try { @@ -4584,7 +4584,7 @@ public async Task TestEnumParametersOrDefaultAsy /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index be99808e8e53..df3b3537a120 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -204,8 +204,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); - if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) - return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter); if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter) return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString(); if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter) diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 0d45a7a32e20..2619a2bb97b0 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -176,8 +176,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new TestDescendantsJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES index 4d9b3d8248d3..905ec3b8592d 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/.openapi-generator/FILES @@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md docs/models/TestDescendants.md docs/models/TestDescendantsObjectType.md -docs/models/TestEnumParametersEnumHeaderStringParameter.md docs/models/TestEnumParametersEnumQueryDoubleParameter.md docs/models/TestEnumParametersEnumQueryIntegerParameter.md docs/models/TestEnumParametersRequestEnumFormString.md @@ -288,7 +287,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/TestDescendants.cs src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs -src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml index 6dae7b5ccbd3..8e6e916f99eb 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml @@ -772,7 +772,7 @@ paths: name: enum_header_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: simple - description: Query parameter enum test (string array) explode: true @@ -790,7 +790,7 @@ paths: name: enum_query_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: form - description: Query parameter enum test (double) explode: true @@ -2819,13 +2819,6 @@ components: enum_form_string: $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" type: object - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md index 408b1fc495ae..1a41e359c74e 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/docs/apis/FakeApi.md @@ -483,7 +483,7 @@ void (empty response body) # **TestEnumParameters** -> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List enumQueryStringArray = null) +> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List enumQueryStringArray = null) To test enum parameters @@ -496,11 +496,11 @@ To test enum parameters |------|------|-------------|-------| | **enumFormString** | **TestEnumParametersRequestEnumFormString** | | [optional] | | **enumFormStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional] | -| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional] | +| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional] | | **enumHeaderStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional] | | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional] | | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional] | -| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional] | +| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional] | | **enumQueryStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional] | ### Return type diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index e978aa8b5292..3f5b3258a5b3 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -373,7 +373,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// To test enum parameters @@ -391,7 +391,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// Fake endpoint to test group parameters (optional) @@ -4441,7 +4441,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); } - partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); + partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); /// /// Validates the request parameters @@ -4474,7 +4474,7 @@ private void ValidateTestEnumParameters(Option /// /// - private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4495,7 +4495,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// Logs exceptions that occur while retrieving the server response @@ -4511,7 +4511,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4534,7 +4534,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// /// /// - partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// To test enum parameters To test enum parameters @@ -4549,7 +4549,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { try { @@ -4575,7 +4575,7 @@ public async Task TestEnumParametersOrDefaultAsy /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 965dcceeeeb5..69cca784e095 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -205,8 +205,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); - if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) - return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter); if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter) return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString(); if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter) diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index b5191f41e54e..03f33980ecc4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -174,8 +174,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new TestDescendantsJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES index 4d9b3d8248d3..905ec3b8592d 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/.openapi-generator/FILES @@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md docs/models/TestDescendants.md docs/models/TestDescendantsObjectType.md -docs/models/TestEnumParametersEnumHeaderStringParameter.md docs/models/TestEnumParametersEnumQueryDoubleParameter.md docs/models/TestEnumParametersEnumQueryIntegerParameter.md docs/models/TestEnumParametersRequestEnumFormString.md @@ -288,7 +287,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/TestDescendants.cs src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs -src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml index 6dae7b5ccbd3..8e6e916f99eb 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml @@ -772,7 +772,7 @@ paths: name: enum_header_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: simple - description: Query parameter enum test (string array) explode: true @@ -790,7 +790,7 @@ paths: name: enum_query_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: form - description: Query parameter enum test (double) explode: true @@ -2819,13 +2819,6 @@ components: enum_form_string: $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" type: object - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md index 408b1fc495ae..1a41e359c74e 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/docs/apis/FakeApi.md @@ -483,7 +483,7 @@ void (empty response body) # **TestEnumParameters** -> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List enumQueryStringArray = null) +> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List enumQueryStringArray = null) To test enum parameters @@ -496,11 +496,11 @@ To test enum parameters |------|------|-------------|-------| | **enumFormString** | **TestEnumParametersRequestEnumFormString** | | [optional] | | **enumFormStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional] | -| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional] | +| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional] | | **enumHeaderStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional] | | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional] | | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional] | -| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional] | +| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional] | | **enumQueryStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional] | ### Return type diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index e978aa8b5292..3f5b3258a5b3 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -373,7 +373,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// To test enum parameters @@ -391,7 +391,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// Fake endpoint to test group parameters (optional) @@ -4441,7 +4441,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); } - partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); + partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); /// /// Validates the request parameters @@ -4474,7 +4474,7 @@ private void ValidateTestEnumParameters(Option /// /// - private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4495,7 +4495,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// Logs exceptions that occur while retrieving the server response @@ -4511,7 +4511,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4534,7 +4534,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// /// /// - partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// To test enum parameters To test enum parameters @@ -4549,7 +4549,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { try { @@ -4575,7 +4575,7 @@ public async Task TestEnumParametersOrDefaultAsy /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index 965dcceeeeb5..69cca784e095 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -205,8 +205,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); - if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) - return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter); if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter) return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString(); if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter) diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index b5191f41e54e..03f33980ecc4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -174,8 +174,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new TestDescendantsJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES index 737d53400248..cacee1eafc1b 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/.openapi-generator/FILES @@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md docs/models/TestDescendants.md docs/models/TestDescendantsObjectType.md -docs/models/TestEnumParametersEnumHeaderStringParameter.md docs/models/TestEnumParametersEnumQueryDoubleParameter.md docs/models/TestEnumParametersEnumQueryIntegerParameter.md docs/models/TestEnumParametersRequestEnumFormString.md @@ -290,7 +289,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/TestDescendants.cs src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs -src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml index 6dae7b5ccbd3..8e6e916f99eb 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml @@ -772,7 +772,7 @@ paths: name: enum_header_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: simple - description: Query parameter enum test (string array) explode: true @@ -790,7 +790,7 @@ paths: name: enum_query_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: form - description: Query parameter enum test (double) explode: true @@ -2819,13 +2819,6 @@ components: enum_form_string: $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" type: object - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md index 0febc3875e97..abf12b49fbf0 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/docs/apis/FakeApi.md @@ -483,7 +483,7 @@ void (empty response body) # **TestEnumParameters** -> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List enumQueryStringArray = null) +> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List enumQueryStringArray = null) To test enum parameters @@ -496,11 +496,11 @@ To test enum parameters |------|------|-------------|-------| | **enumFormString** | **TestEnumParametersRequestEnumFormString** | | [optional] | | **enumFormStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional] | -| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional] | +| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional] | | **enumHeaderStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional] | | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional] | | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional] | -| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional] | +| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional] | | **enumQueryStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional] | ### Return type diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 6638ec4068d1..53ad97cbc3c1 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -373,7 +373,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// To test enum parameters @@ -391,7 +391,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// Fake endpoint to test group parameters (optional) @@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); } - partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); + partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); /// /// Validates the request parameters @@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option /// /// - private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// Logs exceptions that occur while retrieving the server response @@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// /// /// - partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// To test enum parameters To test enum parameters @@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { try { @@ -4584,7 +4584,7 @@ public async Task TestEnumParametersOrDefaultAsy /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index be99808e8e53..df3b3537a120 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -204,8 +204,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); - if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) - return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter); if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter) return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString(); if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter) diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 0d45a7a32e20..2619a2bb97b0 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -176,8 +176,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new TestDescendantsJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter()); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES index 737d53400248..cacee1eafc1b 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/.openapi-generator/FILES @@ -121,7 +121,6 @@ docs/models/TestCollectionEndingWithWordList.md docs/models/TestCollectionEndingWithWordListObject.md docs/models/TestDescendants.md docs/models/TestDescendantsObjectType.md -docs/models/TestEnumParametersEnumHeaderStringParameter.md docs/models/TestEnumParametersEnumQueryDoubleParameter.md docs/models/TestEnumParametersEnumQueryIntegerParameter.md docs/models/TestEnumParametersRequestEnumFormString.md @@ -290,7 +289,6 @@ src/Org.OpenAPITools/Model/TestCollectionEndingWithWordList.cs src/Org.OpenAPITools/Model/TestCollectionEndingWithWordListObject.cs src/Org.OpenAPITools/Model/TestDescendants.cs src/Org.OpenAPITools/Model/TestDescendantsObjectType.cs -src/Org.OpenAPITools/Model/TestEnumParametersEnumHeaderStringParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryDoubleParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersEnumQueryIntegerParameter.cs src/Org.OpenAPITools/Model/TestEnumParametersRequestEnumFormString.cs diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml index 6dae7b5ccbd3..8e6e916f99eb 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml @@ -772,7 +772,7 @@ paths: name: enum_header_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: simple - description: Query parameter enum test (string array) explode: true @@ -790,7 +790,7 @@ paths: name: enum_query_string required: false schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" style: form - description: Query parameter enum test (double) explode: true @@ -2819,13 +2819,6 @@ components: enum_form_string: $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" type: object - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md index 0febc3875e97..abf12b49fbf0 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/docs/apis/FakeApi.md @@ -483,7 +483,7 @@ void (empty response body) # **TestEnumParameters** -> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersEnumHeaderStringParameter enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersEnumHeaderStringParameter enumQueryString = null, List enumQueryStringArray = null) +> void TestEnumParameters (TestEnumParametersRequestEnumFormString enumFormString = null, List enumFormStringArray = null, TestEnumParametersRequestEnumFormString enumHeaderString = null, List enumHeaderStringArray = null, TestEnumParametersEnumQueryDoubleParameter enumQueryDouble = null, TestEnumParametersEnumQueryIntegerParameter enumQueryInteger = null, TestEnumParametersRequestEnumFormString enumQueryString = null, List enumQueryStringArray = null) To test enum parameters @@ -496,11 +496,11 @@ To test enum parameters |------|------|-------------|-------| | **enumFormString** | **TestEnumParametersRequestEnumFormString** | | [optional] | | **enumFormStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Form parameter enum test (string array) | [optional] | -| **enumHeaderString** | **TestEnumParametersEnumHeaderStringParameter** | Header parameter enum test (string) | [optional] | +| **enumHeaderString** | **TestEnumParametersRequestEnumFormString** | Header parameter enum test (string) | [optional] | | **enumHeaderStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Header parameter enum test (string array) | [optional] | | **enumQueryDouble** | **TestEnumParametersEnumQueryDoubleParameter** | Query parameter enum test (double) | [optional] | | **enumQueryInteger** | **TestEnumParametersEnumQueryIntegerParameter** | Query parameter enum test (double) | [optional] | -| **enumQueryString** | **TestEnumParametersEnumHeaderStringParameter** | Query parameter enum test (string) | [optional] | +| **enumQueryString** | **TestEnumParametersRequestEnumFormString** | Query parameter enum test (string) | [optional] | | **enumQueryStringArray** | [**List<TestEnumParametersRequestEnumFormStringArrayInner>**](TestEnumParametersRequestEnumFormStringArrayInner.md) | Query parameter enum test (string array) | [optional] | ### Return type diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs index 6638ec4068d1..53ad97cbc3c1 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Api/FakeApi.cs @@ -373,7 +373,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// To test enum parameters @@ -391,7 +391,7 @@ public interface IFakeApi : IApi /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); + Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default); /// /// Fake endpoint to test group parameters (optional) @@ -4450,7 +4450,7 @@ private void OnDeserializationErrorDefaultImplementation(Exception exception, Ht partial void OnDeserializationError(ref bool suppressDefaultLog, Exception exception, HttpStatusCode httpStatusCode); } - partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); + partial void FormatTestEnumParameters(ref Option enumFormString, Option> enumFormStringArray, ref Option enumHeaderString, Option> enumHeaderStringArray, ref Option enumQueryDouble, ref Option enumQueryInteger, ref Option enumQueryString, Option> enumQueryStringArray); /// /// Validates the request parameters @@ -4483,7 +4483,7 @@ private void ValidateTestEnumParameters(Option /// /// - private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLog = false; AfterTestEnumParameters(ref suppressDefaultLog, apiResponseLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4504,7 +4504,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void AfterTestEnumParameters(ref bool suppressDefaultLog, ITestEnumParametersApiResponse apiResponseLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// Logs exceptions that occur while retrieving the server response @@ -4520,7 +4520,7 @@ private void AfterTestEnumParametersDefaultImplementation(ITestEnumParametersApi /// /// /// - private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) + private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray) { bool suppressDefaultLogLocalVar = false; OnErrorTestEnumParameters(ref suppressDefaultLogLocalVar, exceptionLocalVar, pathFormatLocalVar, pathLocalVar, enumFormString, enumFormStringArray, enumHeaderString, enumHeaderStringArray, enumQueryDouble, enumQueryInteger, enumQueryString, enumQueryStringArray); @@ -4543,7 +4543,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// /// /// - partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); + partial void OnErrorTestEnumParameters(ref bool suppressDefaultLogLocalVar, Exception exceptionLocalVar, string pathFormatLocalVar, string pathLocalVar, Option enumFormString, Option> enumFormStringArray, Option enumHeaderString, Option> enumHeaderStringArray, Option enumQueryDouble, Option enumQueryInteger, Option enumQueryString, Option> enumQueryStringArray); /// /// To test enum parameters To test enum parameters @@ -4558,7 +4558,7 @@ private void OnErrorTestEnumParametersDefaultImplementation(Exception exceptionL /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersOrDefaultAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { try { @@ -4584,7 +4584,7 @@ public async Task TestEnumParametersOrDefaultAsy /// Query parameter enum test (string array) (optional) /// Cancellation Token to cancel the request. /// <> - public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) + public async Task TestEnumParametersAsync(Option enumFormString = default, Option> enumFormStringArray = default, Option enumHeaderString = default, Option> enumHeaderStringArray = default, Option enumQueryDouble = default, Option enumQueryInteger = default, Option enumQueryString = default, Option> enumQueryStringArray = default, System.Threading.CancellationToken cancellationToken = default) { UriBuilder uriBuilderLocalVar = new UriBuilder(); diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs index be99808e8e53..df3b3537a120 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/ClientUtils.cs @@ -204,8 +204,6 @@ public static string ParameterToString(object obj, string format = ISO8601_DATET return RequiredClassRequiredNullableEnumStringValueConverter.ToJsonValue(requiredClassRequiredNullableEnumString); if (obj is TestDescendantsObjectType testDescendantsObjectType) return TestDescendantsObjectTypeValueConverter.ToJsonValue(testDescendantsObjectType); - if (obj is TestEnumParametersEnumHeaderStringParameter testEnumParametersEnumHeaderStringParameter) - return TestEnumParametersEnumHeaderStringParameterValueConverter.ToJsonValue(testEnumParametersEnumHeaderStringParameter); if (obj is TestEnumParametersEnumQueryDoubleParameter testEnumParametersEnumQueryDoubleParameter) return TestEnumParametersEnumQueryDoubleParameterValueConverter.ToJsonValue(testEnumParametersEnumQueryDoubleParameter).ToString(); if (obj is TestEnumParametersEnumQueryIntegerParameter testEnumParametersEnumQueryIntegerParameter) diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs index 0d45a7a32e20..2619a2bb97b0 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -176,8 +176,6 @@ public HostConfiguration(IServiceCollection services) _jsonOptions.Converters.Add(new TestDescendantsJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeJsonConverter()); _jsonOptions.Converters.Add(new TestDescendantsObjectTypeNullableJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterJsonConverter()); - _jsonOptions.Converters.Add(new TestEnumParametersEnumHeaderStringParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryDoubleParameterNullableJsonConverter()); _jsonOptions.Converters.Add(new TestEnumParametersEnumQueryIntegerParameterJsonConverter()); diff --git a/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES index 1eb565d74f11..c74579383333 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-aiohttp/.openapi-generator/FILES @@ -120,7 +120,6 @@ docs/Tiger.md docs/Type.md docs/UnnamedDictWithAdditionalModelListProperties.md docs/UnnamedDictWithAdditionalStringListProperties.md -docs/UploadFileWithAdditionalPropertiesRequestObject.md docs/User.md docs/UserApi.md docs/UuidWithPattern.md @@ -251,7 +250,6 @@ petstore_api/models/tiger.py petstore_api/models/type.py petstore_api/models/unnamed_dict_with_additional_model_list_properties.py petstore_api/models/unnamed_dict_with_additional_string_list_properties.py -petstore_api/models/upload_file_with_additional_properties_request_object.py petstore_api/models/user.py petstore_api/models/uuid_with_pattern.py petstore_api/models/with_nested_one_of.py diff --git a/samples/openapi3/client/petstore/python-aiohttp/README.md b/samples/openapi3/client/petstore/python-aiohttp/README.md index 083f77de9690..bf68ad1bff6a 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/README.md +++ b/samples/openapi3/client/petstore/python-aiohttp/README.md @@ -261,7 +261,6 @@ Class | Method | HTTP request | Description - [Type](docs/Type.md) - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md) - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md) - - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md) - [User](docs/User.md) - [UuidWithPattern](docs/UuidWithPattern.md) - [WithNestedOneOf](docs/WithNestedOneOf.md) diff --git a/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md index 8f79394afc28..a8b76b34b894 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-aiohttp/docs/FakeApi.md @@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data ```python import petstore_api from petstore_api.models.model_api_response import ModelApiResponse -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker from petstore_api.rest import ApiException from pprint import pprint @@ -2494,7 +2494,7 @@ async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) file = None # bytes | file to upload - object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject | (optional) + object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker | (optional) count = 56 # int | Integer count (optional) try: @@ -2514,7 +2514,7 @@ async with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **bytes**| file to upload | - **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)| | [optional] + **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)| | [optional] **count** | **int**| Integer count | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py index c7f461775f59..6a76c22cac03 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/__init__.py @@ -146,7 +146,6 @@ "Type", "UnnamedDictWithAdditionalModelListProperties", "UnnamedDictWithAdditionalStringListProperties", - "UploadFileWithAdditionalPropertiesRequestObject", "User", "UuidWithPattern", "WithNestedOneOf", @@ -285,7 +284,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py index 9e895f7806ee..0d435906bfba 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/api/fake_api.py @@ -32,7 +32,6 @@ from petstore_api.models.tag import Tag from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized @@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize( async def upload_file_with_additional_properties( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9842,7 +9841,7 @@ async def upload_file_with_additional_properties( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9895,7 +9894,7 @@ async def upload_file_with_additional_properties( async def upload_file_with_additional_properties_with_http_info( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9917,7 +9916,7 @@ async def upload_file_with_additional_properties_with_http_info( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9970,7 +9969,7 @@ async def upload_file_with_additional_properties_with_http_info( async def upload_file_with_additional_properties_without_preload_content( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9992,7 +9991,7 @@ async def upload_file_with_additional_properties_without_preload_content( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one diff --git a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py index 308e6dfc3ebb..e498be0e1492 100644 --- a/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/__init__.py @@ -123,7 +123,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES index 1eb565d74f11..c74579383333 100644 --- a/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-httpx/.openapi-generator/FILES @@ -120,7 +120,6 @@ docs/Tiger.md docs/Type.md docs/UnnamedDictWithAdditionalModelListProperties.md docs/UnnamedDictWithAdditionalStringListProperties.md -docs/UploadFileWithAdditionalPropertiesRequestObject.md docs/User.md docs/UserApi.md docs/UuidWithPattern.md @@ -251,7 +250,6 @@ petstore_api/models/tiger.py petstore_api/models/type.py petstore_api/models/unnamed_dict_with_additional_model_list_properties.py petstore_api/models/unnamed_dict_with_additional_string_list_properties.py -petstore_api/models/upload_file_with_additional_properties_request_object.py petstore_api/models/user.py petstore_api/models/uuid_with_pattern.py petstore_api/models/with_nested_one_of.py diff --git a/samples/openapi3/client/petstore/python-httpx/README.md b/samples/openapi3/client/petstore/python-httpx/README.md index 083f77de9690..bf68ad1bff6a 100644 --- a/samples/openapi3/client/petstore/python-httpx/README.md +++ b/samples/openapi3/client/petstore/python-httpx/README.md @@ -261,7 +261,6 @@ Class | Method | HTTP request | Description - [Type](docs/Type.md) - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md) - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md) - - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md) - [User](docs/User.md) - [UuidWithPattern](docs/UuidWithPattern.md) - [WithNestedOneOf](docs/WithNestedOneOf.md) diff --git a/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md b/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md index 8f79394afc28..a8b76b34b894 100644 --- a/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-httpx/docs/FakeApi.md @@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data ```python import petstore_api from petstore_api.models.model_api_response import ModelApiResponse -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker from petstore_api.rest import ApiException from pprint import pprint @@ -2494,7 +2494,7 @@ async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) file = None # bytes | file to upload - object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject | (optional) + object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker | (optional) count = 56 # int | Integer count (optional) try: @@ -2514,7 +2514,7 @@ async with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **bytes**| file to upload | - **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)| | [optional] + **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)| | [optional] **count** | **int**| Integer count | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py index c7f461775f59..6a76c22cac03 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/__init__.py @@ -146,7 +146,6 @@ "Type", "UnnamedDictWithAdditionalModelListProperties", "UnnamedDictWithAdditionalStringListProperties", - "UploadFileWithAdditionalPropertiesRequestObject", "User", "UuidWithPattern", "WithNestedOneOf", @@ -285,7 +284,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py index 9e895f7806ee..0d435906bfba 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/api/fake_api.py @@ -32,7 +32,6 @@ from petstore_api.models.tag import Tag from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized @@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize( async def upload_file_with_additional_properties( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9842,7 +9841,7 @@ async def upload_file_with_additional_properties( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9895,7 +9894,7 @@ async def upload_file_with_additional_properties( async def upload_file_with_additional_properties_with_http_info( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9917,7 +9916,7 @@ async def upload_file_with_additional_properties_with_http_info( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9970,7 +9969,7 @@ async def upload_file_with_additional_properties_with_http_info( async def upload_file_with_additional_properties_without_preload_content( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9992,7 +9991,7 @@ async def upload_file_with_additional_properties_without_preload_content( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one diff --git a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py index 308e6dfc3ebb..e498be0e1492 100644 --- a/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-httpx/petstore_api/models/__init__.py @@ -123,7 +123,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES index 1eb565d74f11..c74579383333 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-lazyImports/.openapi-generator/FILES @@ -120,7 +120,6 @@ docs/Tiger.md docs/Type.md docs/UnnamedDictWithAdditionalModelListProperties.md docs/UnnamedDictWithAdditionalStringListProperties.md -docs/UploadFileWithAdditionalPropertiesRequestObject.md docs/User.md docs/UserApi.md docs/UuidWithPattern.md @@ -251,7 +250,6 @@ petstore_api/models/tiger.py petstore_api/models/type.py petstore_api/models/unnamed_dict_with_additional_model_list_properties.py petstore_api/models/unnamed_dict_with_additional_string_list_properties.py -petstore_api/models/upload_file_with_additional_properties_request_object.py petstore_api/models/user.py petstore_api/models/uuid_with_pattern.py petstore_api/models/with_nested_one_of.py diff --git a/samples/openapi3/client/petstore/python-lazyImports/README.md b/samples/openapi3/client/petstore/python-lazyImports/README.md index 566c23f9203e..da9b286087d3 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/README.md +++ b/samples/openapi3/client/petstore/python-lazyImports/README.md @@ -261,7 +261,6 @@ Class | Method | HTTP request | Description - [Type](docs/Type.md) - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md) - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md) - - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md) - [User](docs/User.md) - [UuidWithPattern](docs/UuidWithPattern.md) - [WithNestedOneOf](docs/WithNestedOneOf.md) diff --git a/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md b/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md index 7ef2af8af2c3..af0f050135b9 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-lazyImports/docs/FakeApi.md @@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data ```python import petstore_api from petstore_api.models.model_api_response import ModelApiResponse -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker from petstore_api.rest import ApiException from pprint import pprint @@ -2494,7 +2494,7 @@ with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) file = None # bytes | file to upload - object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject | (optional) + object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker | (optional) count = 56 # int | Integer count (optional) try: @@ -2514,7 +2514,7 @@ with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **bytes**| file to upload | - **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)| | [optional] + **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)| | [optional] **count** | **int**| Integer count | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py index 64ad7b567d1a..2688f53428a9 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/__init__.py @@ -146,7 +146,6 @@ "Type", "UnnamedDictWithAdditionalModelListProperties", "UnnamedDictWithAdditionalStringListProperties", - "UploadFileWithAdditionalPropertiesRequestObject", "User", "UuidWithPattern", "WithNestedOneOf", @@ -286,7 +285,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties - from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf @@ -432,7 +430,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py index 2373d1680c58..e3f86661e566 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/api/fake_api.py @@ -32,7 +32,6 @@ from petstore_api.models.tag import Tag from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized @@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize( def upload_file_with_additional_properties( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9842,7 +9841,7 @@ def upload_file_with_additional_properties( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9895,7 +9894,7 @@ def upload_file_with_additional_properties( def upload_file_with_additional_properties_with_http_info( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9917,7 +9916,7 @@ def upload_file_with_additional_properties_with_http_info( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9970,7 +9969,7 @@ def upload_file_with_additional_properties_with_http_info( def upload_file_with_additional_properties_without_preload_content( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9992,7 +9991,7 @@ def upload_file_with_additional_properties_without_preload_content( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one diff --git a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py index 9f052c816cb7..34c087697749 100644 --- a/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/__init__.py @@ -124,7 +124,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties - from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf @@ -246,7 +245,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES index 3bdfdd3eebd9..a67a13c7dcba 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/.openapi-generator/FILES @@ -120,7 +120,6 @@ docs/Tiger.md docs/Type.md docs/UnnamedDictWithAdditionalModelListProperties.md docs/UnnamedDictWithAdditionalStringListProperties.md -docs/UploadFileWithAdditionalPropertiesRequestObject.md docs/User.md docs/UserApi.md docs/UuidWithPattern.md @@ -251,7 +250,6 @@ petstore_api/models/tiger.py petstore_api/models/type.py petstore_api/models/unnamed_dict_with_additional_model_list_properties.py petstore_api/models/unnamed_dict_with_additional_string_list_properties.py -petstore_api/models/upload_file_with_additional_properties_request_object.py petstore_api/models/user.py petstore_api/models/uuid_with_pattern.py petstore_api/models/with_nested_one_of.py diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md index a6aa883a7132..99a8f2b5f1fd 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/README.md @@ -262,7 +262,6 @@ Class | Method | HTTP request | Description - [Type](docs/Type.md) - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md) - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md) - - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md) - [User](docs/User.md) - [UuidWithPattern](docs/UuidWithPattern.md) - [WithNestedOneOf](docs/WithNestedOneOf.md) diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md index 6aa84ef041f1..39863affaa41 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/docs/FakeApi.md @@ -2503,7 +2503,7 @@ import time import os import petstore_api from petstore_api.models.api_response import ApiResponse -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker from petstore_api.rest import ApiException from pprint import pprint @@ -2519,7 +2519,7 @@ async with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) file = None # bytearray | file to upload - object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject | (optional) + object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker | (optional) count = 56 # int | Integer count (optional) try: @@ -2538,7 +2538,7 @@ async with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **bytearray**| file to upload | - **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)| | [optional] + **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)| | [optional] **count** | **int**| Integer count | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py index e89049d66426..a6156ac008c3 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/__init__.py @@ -146,7 +146,6 @@ "Type", "UnnamedDictWithAdditionalModelListProperties", "UnnamedDictWithAdditionalStringListProperties", - "UploadFileWithAdditionalPropertiesRequestObject", "User", "UuidWithPattern", "WithNestedOneOf", @@ -285,7 +284,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py index 7ee53259a5b9..fea013dec496 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/api/fake_api.py @@ -38,7 +38,6 @@ from petstore_api.models.tag import Tag from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.api_client import ApiClient @@ -4666,7 +4665,7 @@ async def test_string_map_reference_with_http_info(self, request_body : Annotate _request_auth=_params.get('_request_auth')) @validate_arguments - async def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 + async def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 """uploads a file and additional properties using multipart/form-data # noqa: E501 # noqa: E501 @@ -4674,7 +4673,7 @@ async def upload_file_with_additional_properties(self, file : Annotated[Union[St :param file: file to upload (required) :type file: bytearray :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. @@ -4693,7 +4692,7 @@ async def upload_file_with_additional_properties(self, file : Annotated[Union[St return await self.upload_file_with_additional_properties_with_http_info(file, object, count, **kwargs) # noqa: E501 @validate_arguments - async def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 + async def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 """uploads a file and additional properties using multipart/form-data # noqa: E501 # noqa: E501 @@ -4701,7 +4700,7 @@ async def upload_file_with_additional_properties_with_http_info(self, file : Ann :param file: file to upload (required) :type file: bytearray :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _preload_content: if False, the ApiResponse.data will diff --git a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py index 51cf981e4b26..2ddd11a01de7 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1-aiohttp/petstore_api/models/__init__.py @@ -124,7 +124,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES index 3bdfdd3eebd9..a67a13c7dcba 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python-pydantic-v1/.openapi-generator/FILES @@ -120,7 +120,6 @@ docs/Tiger.md docs/Type.md docs/UnnamedDictWithAdditionalModelListProperties.md docs/UnnamedDictWithAdditionalStringListProperties.md -docs/UploadFileWithAdditionalPropertiesRequestObject.md docs/User.md docs/UserApi.md docs/UuidWithPattern.md @@ -251,7 +250,6 @@ petstore_api/models/tiger.py petstore_api/models/type.py petstore_api/models/unnamed_dict_with_additional_model_list_properties.py petstore_api/models/unnamed_dict_with_additional_string_list_properties.py -petstore_api/models/upload_file_with_additional_properties_request_object.py petstore_api/models/user.py petstore_api/models/uuid_with_pattern.py petstore_api/models/with_nested_one_of.py diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/README.md b/samples/openapi3/client/petstore/python-pydantic-v1/README.md index f8239fe5f3cf..3f98b6bed33a 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/README.md +++ b/samples/openapi3/client/petstore/python-pydantic-v1/README.md @@ -262,7 +262,6 @@ Class | Method | HTTP request | Description - [Type](docs/Type.md) - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md) - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md) - - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md) - [User](docs/User.md) - [UuidWithPattern](docs/UuidWithPattern.md) - [WithNestedOneOf](docs/WithNestedOneOf.md) diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md b/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md index 6935c8587a23..9a2efcfe2d57 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python-pydantic-v1/docs/FakeApi.md @@ -2503,7 +2503,7 @@ import time import os import petstore_api from petstore_api.models.api_response import ApiResponse -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker from petstore_api.rest import ApiException from pprint import pprint @@ -2519,7 +2519,7 @@ with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) file = None # bytearray | file to upload - object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject | (optional) + object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker | (optional) count = 56 # int | Integer count (optional) try: @@ -2538,7 +2538,7 @@ with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **bytearray**| file to upload | - **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)| | [optional] + **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)| | [optional] **count** | **int**| Integer count | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py index e89049d66426..a6156ac008c3 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/__init__.py @@ -146,7 +146,6 @@ "Type", "UnnamedDictWithAdditionalModelListProperties", "UnnamedDictWithAdditionalStringListProperties", - "UploadFileWithAdditionalPropertiesRequestObject", "User", "UuidWithPattern", "WithNestedOneOf", @@ -285,7 +284,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py index 62ef06ed6b0e..e7796aa4c8d9 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/api/fake_api.py @@ -37,7 +37,6 @@ from petstore_api.models.tag import Tag from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.api_client import ApiClient @@ -5241,7 +5240,7 @@ def test_string_map_reference_with_http_info(self, request_body : Annotated[Dict _request_auth=_params.get('_request_auth')) @validate_arguments - def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 + def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 """uploads a file and additional properties using multipart/form-data # noqa: E501 # noqa: E501 @@ -5254,7 +5253,7 @@ def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBy :param file: file to upload (required) :type file: bytearray :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param async_req: Whether to execute the request asynchronously. @@ -5275,7 +5274,7 @@ def upload_file_with_additional_properties(self, file : Annotated[Union[StrictBy return self.upload_file_with_additional_properties_with_http_info(file, object, count, **kwargs) # noqa: E501 @validate_arguments - def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 + def upload_file_with_additional_properties_with_http_info(self, file : Annotated[Union[StrictBytes, StrictStr], Field(..., description="file to upload")], object : Optional[TestObjectForMultipartRequestsRequestMarker] = None, count : Annotated[Optional[StrictInt], Field(description="Integer count")] = None, **kwargs) -> ApiResponse: # noqa: E501 """uploads a file and additional properties using multipart/form-data # noqa: E501 # noqa: E501 @@ -5288,7 +5287,7 @@ def upload_file_with_additional_properties_with_http_info(self, file : Annotated :param file: file to upload (required) :type file: bytearray :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param async_req: Whether to execute the request asynchronously. diff --git a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py index 51cf981e4b26..2ddd11a01de7 100644 --- a/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/__init__.py @@ -124,7 +124,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python/.openapi-generator/FILES b/samples/openapi3/client/petstore/python/.openapi-generator/FILES index 1eb565d74f11..c74579383333 100755 --- a/samples/openapi3/client/petstore/python/.openapi-generator/FILES +++ b/samples/openapi3/client/petstore/python/.openapi-generator/FILES @@ -120,7 +120,6 @@ docs/Tiger.md docs/Type.md docs/UnnamedDictWithAdditionalModelListProperties.md docs/UnnamedDictWithAdditionalStringListProperties.md -docs/UploadFileWithAdditionalPropertiesRequestObject.md docs/User.md docs/UserApi.md docs/UuidWithPattern.md @@ -251,7 +250,6 @@ petstore_api/models/tiger.py petstore_api/models/type.py petstore_api/models/unnamed_dict_with_additional_model_list_properties.py petstore_api/models/unnamed_dict_with_additional_string_list_properties.py -petstore_api/models/upload_file_with_additional_properties_request_object.py petstore_api/models/user.py petstore_api/models/uuid_with_pattern.py petstore_api/models/with_nested_one_of.py diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md index 566c23f9203e..da9b286087d3 100755 --- a/samples/openapi3/client/petstore/python/README.md +++ b/samples/openapi3/client/petstore/python/README.md @@ -261,7 +261,6 @@ Class | Method | HTTP request | Description - [Type](docs/Type.md) - [UnnamedDictWithAdditionalModelListProperties](docs/UnnamedDictWithAdditionalModelListProperties.md) - [UnnamedDictWithAdditionalStringListProperties](docs/UnnamedDictWithAdditionalStringListProperties.md) - - [UploadFileWithAdditionalPropertiesRequestObject](docs/UploadFileWithAdditionalPropertiesRequestObject.md) - [User](docs/User.md) - [UuidWithPattern](docs/UuidWithPattern.md) - [WithNestedOneOf](docs/WithNestedOneOf.md) diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md index 7ef2af8af2c3..af0f050135b9 100644 --- a/samples/openapi3/client/petstore/python/docs/FakeApi.md +++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md @@ -2478,7 +2478,7 @@ uploads a file and additional properties using multipart/form-data ```python import petstore_api from petstore_api.models.model_api_response import ModelApiResponse -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject +from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker from petstore_api.rest import ApiException from pprint import pprint @@ -2494,7 +2494,7 @@ with petstore_api.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = petstore_api.FakeApi(api_client) file = None # bytes | file to upload - object = petstore_api.UploadFileWithAdditionalPropertiesRequestObject() # UploadFileWithAdditionalPropertiesRequestObject | (optional) + object = petstore_api.TestObjectForMultipartRequestsRequestMarker() # TestObjectForMultipartRequestsRequestMarker | (optional) count = 56 # int | Integer count (optional) try: @@ -2514,7 +2514,7 @@ with petstore_api.ApiClient(configuration) as api_client: Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- **file** | **bytes**| file to upload | - **object** | [**UploadFileWithAdditionalPropertiesRequestObject**](UploadFileWithAdditionalPropertiesRequestObject.md)| | [optional] + **object** | [**TestObjectForMultipartRequestsRequestMarker**](TestObjectForMultipartRequestsRequestMarker.md)| | [optional] **count** | **int**| Integer count | [optional] ### Return type diff --git a/samples/openapi3/client/petstore/python/petstore_api/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/__init__.py index c7f461775f59..6a76c22cac03 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/__init__.py +++ b/samples/openapi3/client/petstore/python/petstore_api/__init__.py @@ -146,7 +146,6 @@ "Type", "UnnamedDictWithAdditionalModelListProperties", "UnnamedDictWithAdditionalStringListProperties", - "UploadFileWithAdditionalPropertiesRequestObject", "User", "UuidWithPattern", "WithNestedOneOf", @@ -285,7 +284,6 @@ from petstore_api.models.type import Type as Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties as UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties as UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject as UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User as User from petstore_api.models.uuid_with_pattern import UuidWithPattern as UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf as WithNestedOneOf diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py index 2373d1680c58..e3f86661e566 100755 --- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py +++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py @@ -32,7 +32,6 @@ from petstore_api.models.tag import Tag from petstore_api.models.test_inline_freeform_additional_properties_request import TestInlineFreeformAdditionalPropertiesRequest from petstore_api.models.test_object_for_multipart_requests_request_marker import TestObjectForMultipartRequestsRequestMarker -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.api_client import ApiClient, RequestSerialized @@ -9820,7 +9819,7 @@ def _test_string_map_reference_serialize( def upload_file_with_additional_properties( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9842,7 +9841,7 @@ def upload_file_with_additional_properties( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9895,7 +9894,7 @@ def upload_file_with_additional_properties( def upload_file_with_additional_properties_with_http_info( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9917,7 +9916,7 @@ def upload_file_with_additional_properties_with_http_info( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one @@ -9970,7 +9969,7 @@ def upload_file_with_additional_properties_with_http_info( def upload_file_with_additional_properties_without_preload_content( self, file: Annotated[Union[StrictBytes, StrictStr, Tuple[StrictStr, StrictBytes]], Field(description="file to upload")], - object: Optional[UploadFileWithAdditionalPropertiesRequestObject] = None, + object: Optional[TestObjectForMultipartRequestsRequestMarker] = None, count: Annotated[Optional[StrictInt], Field(description="Integer count")] = None, _request_timeout: Union[ None, @@ -9992,7 +9991,7 @@ def upload_file_with_additional_properties_without_preload_content( :param file: file to upload (required) :type file: bytes :param object: - :type object: UploadFileWithAdditionalPropertiesRequestObject + :type object: TestObjectForMultipartRequestsRequestMarker :param count: Integer count :type count: int :param _request_timeout: timeout setting for this request. If one diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py index 308e6dfc3ebb..e498be0e1492 100644 --- a/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py +++ b/samples/openapi3/client/petstore/python/petstore_api/models/__init__.py @@ -123,7 +123,6 @@ from petstore_api.models.type import Type from petstore_api.models.unnamed_dict_with_additional_model_list_properties import UnnamedDictWithAdditionalModelListProperties from petstore_api.models.unnamed_dict_with_additional_string_list_properties import UnnamedDictWithAdditionalStringListProperties -from petstore_api.models.upload_file_with_additional_properties_request_object import UploadFileWithAdditionalPropertiesRequestObject from petstore_api.models.user import User from petstore_api.models.uuid_with_pattern import UuidWithPattern from petstore_api.models.with_nested_one_of import WithNestedOneOf diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES index 0766ce49b8a4..0c114f356abc 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/FILES +++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES @@ -75,7 +75,6 @@ Model/ReadOnlyFirst.php Model/SingleRefType.php Model/SpecialModelName.php Model/Tag.php -Model/TestEnumParametersEnumHeaderStringParameter.php Model/TestEnumParametersEnumQueryDoubleParameter.php Model/TestEnumParametersEnumQueryIntegerParameter.php Model/TestEnumParametersRequestEnumFormString.php diff --git a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php index 0ba584fe917a..6b8205fe19d2 100644 --- a/samples/server/petstore/php-laravel/Api/FakeApiInterface.php +++ b/samples/server/petstore/php-laravel/Api/FakeApiInterface.php @@ -236,9 +236,9 @@ public function testEndpointParameters( * * To test enum parameters * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumHeaderStringArray - * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumHeaderString + * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumHeaderString * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormStringArrayInner[] $enumQueryStringArray - * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumQueryString + * @param null | \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumQueryString * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter $enumQueryInteger * @param null | \OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumQueryDouble * @param null | \OpenAPI\Server\Model\EnumClass[] $enumQueryModelArray @@ -248,9 +248,9 @@ public function testEndpointParameters( */ public function testEnumParameters( ?array $enumHeaderStringArray, - ?\OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumHeaderString, + ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumHeaderString, ?array $enumQueryStringArray, - ?\OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter $enumQueryString, + ?\OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString $enumQueryString, ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter $enumQueryInteger, ?\OpenAPI\Server\Model\TestEnumParametersEnumQueryDoubleParameter $enumQueryDouble, ?array $enumQueryModelArray, diff --git a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php index ae433d8b5ec6..6f2b2b1fe740 100644 --- a/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php +++ b/samples/server/petstore/php-laravel/Http/Controllers/FakeController.php @@ -678,11 +678,11 @@ public function testEnumParameters(Request $request): JsonResponse $enumHeaderStringArray = $request->get('enumHeaderStringArray'); - $enumHeaderString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter::class); + $enumHeaderString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class); $enumQueryStringArray = $request->get('enumQueryStringArray'); - $enumQueryString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumHeaderStringParameter::class); + $enumQueryString = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersRequestEnumFormString::class); $enumQueryInteger = $this->serde->deserialize($request->getContent(), from: 'json', to: \OpenAPI\Server\Model\TestEnumParametersEnumQueryIntegerParameter::class); diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES index 6d35ed812fa6..e899e0a0ceff 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES @@ -51,7 +51,6 @@ docs/ReadOnlyFirst.md docs/Return.md docs/Tag.md docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md -docs/TestEnumParametersEnumHeaderStringParameter.md docs/TestEnumParametersEnumQueryDoubleParameter.md docs/TestEnumParametersEnumQueryIntegerParameter.md docs/TestEnumParametersRequestEnumFormString.md diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md index f1151b3373f5..2c12c203f627 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/README.md @@ -232,7 +232,6 @@ Method | HTTP request | Description - [Return](docs/Return.md) - [Tag](docs/Tag.md) - [TestEnumParametersEnumHeaderStringArrayParameterInner](docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md) - - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md) - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md) - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md) - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md) diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml index 7c364c4a75f9..2d1be7d9a6b8 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml @@ -599,7 +599,7 @@ paths: in: header name: enum_header_string schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" - description: Query parameter enum test (string array) explode: false in: query @@ -613,7 +613,7 @@ paths: in: query name: enum_query_string schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" - description: Query parameter enum test (double) in: query name: enum_query_integer @@ -1437,13 +1437,6 @@ components: - '>' - $ type: string - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs index 9141802f5891..bc8a5faa3599 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs @@ -182,13 +182,13 @@ enum Operation { enum_header_string_array: Option>, /// Header parameter enum test (string) #[structopt(parse(try_from_str = parse_json))] - enum_header_string: Option, + enum_header_string: Option, /// Query parameter enum test (string array) #[structopt(parse(try_from_str = parse_json), long)] enum_query_string_array: Option>, /// Query parameter enum test (string) #[structopt(parse(try_from_str = parse_json))] - enum_query_string: Option, + enum_query_string: Option, /// Query parameter enum test (double) #[structopt(parse(try_from_str = parse_json))] enum_query_integer: Option, diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs index e9c468b84b7b..31c2da85fe6f 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs @@ -245,9 +245,9 @@ fn main() { Some("TestEnumParameters") => { let result = rt.block_on(client.test_enum_parameters( Some(&Vec::new()), - Some(models::TestEnumParametersEnumHeaderStringParameter::Abc), + Some(models::TestEnumParametersRequestEnumFormString::Abc), Some(&Vec::new()), - Some(models::TestEnumParametersEnumHeaderStringParameter::Abc), + Some(models::TestEnumParametersRequestEnumFormString::Abc), Some(models::TestEnumParametersEnumQueryIntegerParameter::Variant1), Some(models::TestEnumParametersEnumQueryDoubleParameter::Variant11), Some(models::TestEnumParametersRequestEnumFormString::Abc) diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs index d360e5cdfb01..a470efbe9af2 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs @@ -244,9 +244,9 @@ impl Api for Server where C: Has + Send + Sync async fn test_enum_parameters( &self, enum_header_string_array: Option<&Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs index 40100279f987..ad61a853d0ee 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs @@ -1329,9 +1329,9 @@ impl Api for Client where async fn test_enum_parameters( &self, param_enum_header_string_array: Option<&Vec>, - param_enum_header_string: Option, + param_enum_header_string: Option, param_enum_query_string_array: Option<&Vec>, - param_enum_query_string: Option, + param_enum_query_string: Option, param_enum_query_integer: Option, param_enum_query_double: Option, param_enum_form_string: Option, diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs index 4791f388b517..37da22cfbd68 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs @@ -361,9 +361,9 @@ pub trait Api { async fn test_enum_parameters( &self, enum_header_string_array: Option<&Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, @@ -598,9 +598,9 @@ pub trait ApiNoContext { async fn test_enum_parameters( &self, enum_header_string_array: Option<&Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, @@ -889,9 +889,9 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn test_enum_parameters( &self, enum_header_string_array: Option<&Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs index 0e82f7a4a002..dde036648950 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs @@ -8023,132 +8023,6 @@ impl TestEnumParametersEnumHeaderStringArrayParameterInner { } } -/// Enumeration of values. -/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]` -/// which helps with FFI. -#[allow(non_camel_case_types)] -#[repr(C)] -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)] -#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))] -pub enum TestEnumParametersEnumHeaderStringParameter { - #[serde(rename = "_abc")] - Abc, - #[serde(rename = "-efg")] - Efg, - #[serde(rename = "(xyz)")] - LeftParenthesisXyzRightParenthesis, -} - -impl std::fmt::Display for TestEnumParametersEnumHeaderStringParameter { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match *self { - TestEnumParametersEnumHeaderStringParameter::Abc => write!(f, "_abc"), - TestEnumParametersEnumHeaderStringParameter::Efg => write!(f, "-efg"), - TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"), - } - } -} - -impl std::str::FromStr for TestEnumParametersEnumHeaderStringParameter { - type Err = String; - - fn from_str(s: &str) -> std::result::Result { - match s { - "_abc" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Abc), - "-efg" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Efg), - "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis), - _ => std::result::Result::Err(format!("Value not valid: {s}")), - } - } -} - -// Methods for converting between header::IntoHeaderValue and hyper::header::HeaderValue - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom> for hyper::header::HeaderValue { - type Error = String; - - fn try_from(hdr_value: header::IntoHeaderValue) -> std::result::Result { - let hdr_value = hdr_value.to_string(); - match hyper::header::HeaderValue::from_str(&hdr_value) { - std::result::Result::Ok(value) => std::result::Result::Ok(value), - std::result::Result::Err(e) => std::result::Result::Err( - format!("Invalid header value for TestEnumParametersEnumHeaderStringParameter - value: {hdr_value} is invalid {e}")) - } - } -} - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom for header::IntoHeaderValue { - type Error = String; - - fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result { - match hdr_value.to_str() { - std::result::Result::Ok(value) => { - match ::from_str(value) { - std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)), - std::result::Result::Err(err) => std::result::Result::Err( - format!("Unable to convert header value '{value}' into TestEnumParametersEnumHeaderStringParameter - {err}")) - } - }, - std::result::Result::Err(e) => std::result::Result::Err( - format!("Unable to convert header: {hdr_value:?} to string: {e}")) - } - } -} - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom>> for hyper::header::HeaderValue { - type Error = String; - - fn try_from(hdr_values: header::IntoHeaderValue>) -> std::result::Result { - let hdr_values : Vec = hdr_values.0.into_iter().map(|hdr_value| { - hdr_value.to_string() - }).collect(); - - match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) { - std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value), - std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}")) - } - } -} - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom for header::IntoHeaderValue> { - type Error = String; - - fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result { - match hdr_values.to_str() { - std::result::Result::Ok(hdr_values) => { - let hdr_values : std::vec::Vec = hdr_values - .split(',') - .filter_map(|hdr_value| match hdr_value.trim() { - "" => std::option::Option::None, - hdr_value => std::option::Option::Some({ - match ::from_str(hdr_value) { - std::result::Result::Ok(value) => std::result::Result::Ok(value), - std::result::Result::Err(err) => std::result::Result::Err( - format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumHeaderStringParameter - {err}")) - } - }) - }).collect::, String>>()?; - - std::result::Result::Ok(header::IntoHeaderValue(hdr_values)) - }, - std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")), - } - } -} - -impl TestEnumParametersEnumHeaderStringParameter { - /// Helper function to allow us to convert this model to an XML string. - /// Will panic if serialisation fails. - #[allow(dead_code)] - pub(crate) fn as_xml(&self) -> String { - serde_xml_rs::to_string(&self).expect("impossible to fail to serialize") - } -} - /// Enumeration of values. /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]` /// which helps with FFI. diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs index 53ab4b0613c2..f1ba3a1c86f8 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs @@ -987,7 +987,7 @@ impl hyper::service::Service<(Request, C)> for Service where let param_enum_header_string = headers.get(HeaderName::from_static("enum_header_string")); let param_enum_header_string = match param_enum_header_string { - Some(v) => match header::IntoHeaderValue::::try_from((*v).clone()) { + Some(v) => match header::IntoHeaderValue::::try_from((*v).clone()) { Ok(result) => Some(result.0), Err(err) => { @@ -1018,7 +1018,7 @@ impl hyper::service::Service<(Request, C)> for Service where let param_enum_query_string = match param_enum_query_string { Some(param_enum_query_string) => { let param_enum_query_string = - ::from_str + ::from_str (¶m_enum_query_string); match param_enum_query_string { Ok(param_enum_query_string) => Some(param_enum_query_string), diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES index 5332ab08344d..e70cf4b2482a 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/.openapi-generator/FILES @@ -51,7 +51,6 @@ docs/ReadOnlyFirst.md docs/Return.md docs/Tag.md docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md -docs/TestEnumParametersEnumHeaderStringParameter.md docs/TestEnumParametersEnumQueryDoubleParameter.md docs/TestEnumParametersEnumQueryIntegerParameter.md docs/TestEnumParametersRequestEnumFormString.md diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md index 1ddb6238e167..9ae33c2644a0 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/README.md @@ -253,7 +253,6 @@ Method | HTTP request | Description - [Return](docs/Return.md) - [Tag](docs/Tag.md) - [TestEnumParametersEnumHeaderStringArrayParameterInner](docs/TestEnumParametersEnumHeaderStringArrayParameterInner.md) - - [TestEnumParametersEnumHeaderStringParameter](docs/TestEnumParametersEnumHeaderStringParameter.md) - [TestEnumParametersEnumQueryDoubleParameter](docs/TestEnumParametersEnumQueryDoubleParameter.md) - [TestEnumParametersEnumQueryIntegerParameter](docs/TestEnumParametersEnumQueryIntegerParameter.md) - [TestEnumParametersRequestEnumFormString](docs/TestEnumParametersRequestEnumFormString.md) diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml index 7c364c4a75f9..2d1be7d9a6b8 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml @@ -599,7 +599,7 @@ paths: in: header name: enum_header_string schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" - description: Query parameter enum test (string array) explode: false in: query @@ -613,7 +613,7 @@ paths: in: query name: enum_query_string schema: - $ref: "#/components/schemas/testEnumParameters_enum_header_string_parameter" + $ref: "#/components/schemas/testEnumParameters_request_enum_form_string" - description: Query parameter enum test (double) in: query name: enum_query_integer @@ -1437,13 +1437,6 @@ components: - '>' - $ type: string - testEnumParameters_enum_header_string_parameter: - default: -efg - enum: - - _abc - - -efg - - (xyz) - type: string testEnumParameters_enum_query_integer_parameter: enum: - 1 diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs index 9ebc7336a225..974d1f3d6587 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/bin/cli.rs @@ -185,14 +185,14 @@ enum Operation { #[clap(value_parser = parse_json::>, long)] enum_header_string_array: Option>, /// Header parameter enum test (string) - #[clap(value_parser = parse_json::)] - enum_header_string: Option, + #[clap(value_parser = parse_json::)] + enum_header_string: Option, /// Query parameter enum test (string array) #[clap(value_parser = parse_json::>, long)] enum_query_string_array: Option>, /// Query parameter enum test (string) - #[clap(value_parser = parse_json::)] - enum_query_string: Option, + #[clap(value_parser = parse_json::)] + enum_query_string: Option, /// Query parameter enum test (double) #[clap(value_parser = parse_json::)] enum_query_integer: Option, diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs index 41ce2cfaee50..e4a1cf520169 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/client/main.rs @@ -254,9 +254,9 @@ fn main() { Some("TestEnumParameters") => { let result = rt.block_on(client.test_enum_parameters( Some(&Vec::new()), - Some(models::TestEnumParametersEnumHeaderStringParameter::Abc), + Some(models::TestEnumParametersRequestEnumFormString::Abc), Some(&Vec::new()), - Some(models::TestEnumParametersEnumHeaderStringParameter::Abc), + Some(models::TestEnumParametersRequestEnumFormString::Abc), Some(models::TestEnumParametersEnumQueryIntegerParameter::Variant1), Some(models::TestEnumParametersEnumQueryDoubleParameter::Variant11), Some(models::TestEnumParametersRequestEnumFormString::Abc) diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs index 98ed4ce9894a..5afa1ea86240 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/examples/server/server.rs @@ -289,9 +289,9 @@ impl Api for Server where C: Has + Send + Sync async fn test_enum_parameters<'a>( &self, enum_header_string_array: Option<&'a Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&'a Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs index 10886d73eed7..8aa1102e56ff 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/client/mod.rs @@ -1426,9 +1426,9 @@ impl Api for Client where async fn test_enum_parameters<'a>( &self, param_enum_header_string_array: Option<&'a Vec>, - param_enum_header_string: Option, + param_enum_header_string: Option, param_enum_query_string_array: Option<&'a Vec>, - param_enum_query_string: Option, + param_enum_query_string: Option, param_enum_query_integer: Option, param_enum_query_double: Option, param_enum_form_string: Option, diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs index 3c409b899326..e4fe8a3e78f9 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/lib.rs @@ -396,9 +396,9 @@ pub trait Api { async fn test_enum_parameters<'a>( &self, enum_header_string_array: Option<&'a Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&'a Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, @@ -636,9 +636,9 @@ pub trait ApiNoContext { async fn test_enum_parameters<'a>( &self, enum_header_string_array: Option<&'a Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&'a Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, @@ -923,9 +923,9 @@ impl + Send + Sync, C: Clone + Send + Sync> ApiNoContext for Contex async fn test_enum_parameters<'a>( &self, enum_header_string_array: Option<&'a Vec>, - enum_header_string: Option, + enum_header_string: Option, enum_query_string_array: Option<&'a Vec>, - enum_query_string: Option, + enum_query_string: Option, enum_query_integer: Option, enum_query_double: Option, enum_form_string: Option, diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs index c724b2becd44..cb704dc645d2 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/models.rs @@ -8840,133 +8840,6 @@ impl TestEnumParametersEnumHeaderStringArrayParameterInner { } } -/// Enumeration of values. -/// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]` -/// which helps with FFI. -#[allow(non_camel_case_types)] -#[repr(C)] -#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize, Hash)] -#[cfg_attr(feature = "validate", derive(Validate))] -#[cfg_attr(feature = "conversion", derive(frunk_enum_derive::LabelledGenericEnum))] -pub enum TestEnumParametersEnumHeaderStringParameter { - #[serde(rename = "_abc")] - Abc, - #[serde(rename = "-efg")] - Efg, - #[serde(rename = "(xyz)")] - LeftParenthesisXyzRightParenthesis, -} - -impl std::fmt::Display for TestEnumParametersEnumHeaderStringParameter { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match *self { - TestEnumParametersEnumHeaderStringParameter::Abc => write!(f, "_abc"), - TestEnumParametersEnumHeaderStringParameter::Efg => write!(f, "-efg"), - TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis => write!(f, "(xyz)"), - } - } -} - -impl std::str::FromStr for TestEnumParametersEnumHeaderStringParameter { - type Err = String; - - fn from_str(s: &str) -> std::result::Result { - match s { - "_abc" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Abc), - "-efg" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::Efg), - "(xyz)" => std::result::Result::Ok(TestEnumParametersEnumHeaderStringParameter::LeftParenthesisXyzRightParenthesis), - _ => std::result::Result::Err(format!("Value not valid: {s}")), - } - } -} - -// Methods for converting between header::IntoHeaderValue and hyper::header::HeaderValue - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom> for hyper::header::HeaderValue { - type Error = String; - - fn try_from(hdr_value: header::IntoHeaderValue) -> std::result::Result { - let hdr_value = hdr_value.to_string(); - match hyper::header::HeaderValue::from_str(&hdr_value) { - std::result::Result::Ok(value) => std::result::Result::Ok(value), - std::result::Result::Err(e) => std::result::Result::Err( - format!("Invalid header value for TestEnumParametersEnumHeaderStringParameter - value: {hdr_value} is invalid {e}")) - } - } -} - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom for header::IntoHeaderValue { - type Error = String; - - fn try_from(hdr_value: hyper::header::HeaderValue) -> std::result::Result { - match hdr_value.to_str() { - std::result::Result::Ok(value) => { - match ::from_str(value) { - std::result::Result::Ok(value) => std::result::Result::Ok(header::IntoHeaderValue(value)), - std::result::Result::Err(err) => std::result::Result::Err( - format!("Unable to convert header value '{value}' into TestEnumParametersEnumHeaderStringParameter - {err}")) - } - }, - std::result::Result::Err(e) => std::result::Result::Err( - format!("Unable to convert header: {hdr_value:?} to string: {e}")) - } - } -} - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom>> for hyper::header::HeaderValue { - type Error = String; - - fn try_from(hdr_values: header::IntoHeaderValue>) -> std::result::Result { - let hdr_values : Vec = hdr_values.0.into_iter().map(|hdr_value| { - hdr_value.to_string() - }).collect(); - - match hyper::header::HeaderValue::from_str(&hdr_values.join(", ")) { - std::result::Result::Ok(hdr_value) => std::result::Result::Ok(hdr_value), - std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to convert {hdr_values:?} into a header - {e}",)) - } - } -} - -#[cfg(any(feature = "client", feature = "server"))] -impl std::convert::TryFrom for header::IntoHeaderValue> { - type Error = String; - - fn try_from(hdr_values: hyper::header::HeaderValue) -> std::result::Result { - match hdr_values.to_str() { - std::result::Result::Ok(hdr_values) => { - let hdr_values : std::vec::Vec = hdr_values - .split(',') - .filter_map(|hdr_value| match hdr_value.trim() { - "" => std::option::Option::None, - hdr_value => std::option::Option::Some({ - match ::from_str(hdr_value) { - std::result::Result::Ok(value) => std::result::Result::Ok(value), - std::result::Result::Err(err) => std::result::Result::Err( - format!("Unable to convert header value '{hdr_value}' into TestEnumParametersEnumHeaderStringParameter - {err}")) - } - }) - }).collect::, String>>()?; - - std::result::Result::Ok(header::IntoHeaderValue(hdr_values)) - }, - std::result::Result::Err(e) => std::result::Result::Err(format!("Unable to parse header: {hdr_values:?} as a string - {e}")), - } - } -} - -impl TestEnumParametersEnumHeaderStringParameter { - /// Helper function to allow us to convert this model to an XML string. - /// Will panic if serialisation fails. - #[allow(dead_code)] - pub(crate) fn as_xml(&self) -> String { - serde_xml_rs::to_string(&self).expect("impossible to fail to serialize") - } -} - /// Enumeration of values. /// Since this enum's variants do not hold data, we can easily define them as `#[repr(C)]` /// which helps with FFI. diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs index 40da357dd587..658f977e24d5 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/src/server/mod.rs @@ -1487,7 +1487,7 @@ where let param_enum_header_string = headers.get(HeaderName::from_static("enum_header_string")); let param_enum_header_string = match param_enum_header_string { - Some(v) => match header::IntoHeaderValue::::try_from((*v).clone()) { + Some(v) => match header::IntoHeaderValue::::try_from((*v).clone()) { Ok(result) => Some(result.0), Err(err) => { @@ -1518,7 +1518,7 @@ where let param_enum_query_string = match param_enum_query_string { Some(param_enum_query_string) => { let param_enum_query_string = - ::from_str + ::from_str (¶m_enum_query_string); match param_enum_query_string { Ok(param_enum_query_string) => Some(param_enum_query_string),