missing fixes

OpenAPITools · Feb 21, 2024 · 671003b · 671003b
1 parent aabda23
commit 671003b
Show file tree

Hide file tree

Showing 52 changed files with 107 additions and 69 deletions.
diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -19,10 +19,7 @@
 
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
-import io.swagger.v3.oas.models.media.ArraySchema;
-import io.swagger.v3.oas.models.media.FileSchema;
-import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.media.*;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import joptsimple.internal.Strings;
 import org.openapitools.codegen.*;
@@ -42,6 +39,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class RustClientCodegen extends AbstractRustCodegen implements CodegenConfig {
     private final Logger LOGGER = LoggerFactory.getLogger(RustClientCodegen.class);
@@ -221,13 +219,24 @@ public CodegenModel fromModel(String name, Schema model) {
                 throw new RuntimeException("oneOf size does not match the model");
             }
 
+            Map<String, String> mappedNameByRef = Optional.ofNullable(model.getDiscriminator())
+                    .map(Discriminator::getMapping)
+                    .map(mapping -> mapping.entrySet()
+                            .stream()
+                            .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey))
+                    )
+                    .orElse(Collections.emptyMap());
+
             for (int i = 0; i < oneOfs.size(); i++) {
                 CodegenProperty oneOf = oneOfs.get(i);
                 Schema schema = schemas.get(i);
                 String aliasType = getTypeDeclaration(schema);
                 if (aliasType.startsWith("models::")) {
                     aliasType = aliasType.substring("models::".length());
                 }
+                if (oneOf.getRef() != null) {
+                    oneOf.setBaseName(mappedNameByRef.get(oneOf.getRef()));
+                }
                 oneOf.setName(aliasType);
             }
         }
@@ -239,10 +248,6 @@ public CodegenModel fromModel(String name, Schema model) {
     public ModelsMap postProcessModels(ModelsMap objs) {
         // Remove the discriminator field from the model, serde will take care of this
         for (ModelMap model : objs.getModels()) {
-            System.out.println("\nMODEL: \n\n");
-            System.out.println(model);
-            System.out.println("\n\n\n");
-
             CodegenModel cm = model.getModel();
 
             if (cm.discriminator != null) {

diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
@@ -8,6 +8,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache
@@ -60,21 +60,15 @@ pub enum {{{classname}}} {
     {{/mappedModels}}
     {{/oneOf}}
     {{^oneOf.isEmpty}}
-    {{#mappedModels}}
-    {{#description}}
-    /// {{{.}}}
-    {{/description}}
-    #[serde(rename="{{mappingName}}")]
-    {{{modelName}}}(Box<{{{modelName}}}>),
-    {{/mappedModels}}
-    {{^mappedModels}}
     {{#composedSchemas.oneOf}}
     {{#description}}
     /// {{{.}}}
     {{/description}}
+    {{#baseName}}
+    #[serde(rename="{{{.}}}")]
+    {{/baseName}}
     {{{name}}}(Box<{{{dataType}}}>),
     {{/composedSchemas.oneOf}}
-    {{/mappedModels}}
     {{/oneOf.isEmpty}}
 }
 

diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
@@ -2,7 +2,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 {{#operations}}

diff --git a/samples/client/others/rust/Cargo.lock b/samples/client/others/rust/Cargo.lock
diff --git a/samples/client/others/rust/hyper/composed-oneof/src/apis/default_api.rs b/samples/client/others/rust/hyper/composed-oneof/src/apis/default_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs
@@ -16,9 +16,9 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum CreateStateRequest {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
 }
 
 impl Default for CreateStateRequest {

diff --git a/...es/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs b/...es/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
@@ -16,11 +16,11 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum CustomOneOfArraySchemaInner {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
     #[serde(rename="c-type")]
-    ObjC(Box<ObjC>),
+    ObjC(Box<models::ObjC>),
 }
 
 impl Default for CustomOneOfArraySchemaInner {

diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs
@@ -16,9 +16,9 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum CustomOneOfSchema {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
 }
 
 impl Default for CustomOneOfSchema {

diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs
@@ -16,11 +16,11 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum GetState200Response {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
     #[serde(rename="d-type")]
-    ObjD(Box<ObjD>),
+    ObjD(Box<models::ObjD>),
 }
 
 impl Default for GetState200Response {

diff --git a/samples/client/others/rust/hyper/emptyObject/src/apis/default_api.rs b/samples/client/others/rust/hyper/emptyObject/src/apis/default_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/apis/default_api.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/apis/default_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/others/rust/hyper/oneOf/src/apis/bar_api.rs b/samples/client/others/rust/hyper/oneOf/src/apis/bar_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/others/rust/hyper/oneOf/src/apis/foo_api.rs b/samples/client/others/rust/hyper/oneOf/src/apis/foo_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs
@@ -16,9 +16,9 @@ use crate::models;
 #[serde(tag = "fruitType")]
 pub enum Fruit {
     #[serde(rename="APPLE")]
-    Apple(Box<Apple>),
+    Apple(Box<models::Apple>),
     #[serde(rename="BANANA")]
-    Banana(Box<Banana>),
+    Banana(Box<models::Banana>),
 }
 
 impl Default for Fruit {

diff --git a/samples/client/others/rust/reqwest-regression-16119/src/apis/default_api.rs b/samples/client/others/rust/reqwest-regression-16119/src/apis/default_api.rs
@@ -11,7 +11,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 

diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/apis/default_api.rs b/samples/client/others/rust/reqwest/composed-oneof/src/apis/default_api.rs
@@ -11,7 +11,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 

diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs
@@ -16,9 +16,9 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum CreateStateRequest {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
 }
 
 impl Default for CreateStateRequest {

diff --git a/.../client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs b/.../client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs
@@ -16,11 +16,11 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum CustomOneOfArraySchemaInner {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
     #[serde(rename="c-type")]
-    ObjC(Box<ObjC>),
+    ObjC(Box<models::ObjC>),
 }
 
 impl Default for CustomOneOfArraySchemaInner {

diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs
@@ -16,9 +16,9 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum CustomOneOfSchema {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
 }
 
 impl Default for CustomOneOfSchema {

diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs
@@ -16,11 +16,11 @@ use crate::models;
 #[serde(tag = "realtype")]
 pub enum GetState200Response {
     #[serde(rename="a-type")]
-    ObjA(Box<ObjA>),
+    ObjA(Box<models::ObjA>),
     #[serde(rename="b-type")]
-    ObjB(Box<ObjB>),
+    ObjB(Box<models::ObjB>),
     #[serde(rename="d-type")]
-    ObjD(Box<ObjD>),
+    ObjD(Box<models::ObjD>),
 }
 
 impl Default for GetState200Response {

diff --git a/samples/client/others/rust/reqwest/emptyObject/src/apis/default_api.rs b/samples/client/others/rust/reqwest/emptyObject/src/apis/default_api.rs
@@ -11,7 +11,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 

diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/default_api.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/default_api.rs
@@ -11,7 +11,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 

diff --git a/samples/client/others/rust/reqwest/oneOf/src/apis/bar_api.rs b/samples/client/others/rust/reqwest/oneOf/src/apis/bar_api.rs
@@ -11,7 +11,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 

diff --git a/samples/client/others/rust/reqwest/oneOf/src/apis/foo_api.rs b/samples/client/others/rust/reqwest/oneOf/src/apis/foo_api.rs
@@ -11,7 +11,7 @@
 
 use reqwest;
 
-use crate::apis::ResponseContent;
+use crate::{apis::ResponseContent, models};
 use super::{Error, configuration};
 
 

diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs
@@ -16,9 +16,9 @@ use crate::models;
 #[serde(tag = "fruitType")]
 pub enum Fruit {
     #[serde(rename="APPLE")]
-    Apple(Box<Apple>),
+    Apple(Box<models::Apple>),
     #[serde(rename="BANANA")]
-    Banana(Box<Banana>),
+    Banana(Box<models::Banana>),
 }
 
 impl Default for Fruit {

diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/fake_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/fake_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/pet_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/store_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/testing_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/testing_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;
 

diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/user_api.rs
@@ -17,6 +17,7 @@ use std::option::Option;
 use hyper;
 use futures::Future;
 
+use crate::models;
 use super::{Error, configuration};
 use super::request as __internal_request;