Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CAMEL-17989 #7464

Merged
merged 1 commit into from Apr 20, 2022
Merged

Fix CAMEL-17989 #7464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 23 additions & 0 deletions ...-dsl-generator/src/main/java/org/apache/camel/generator/openapi/RestDslYamlGenerator.java
View file
Open in desktop
Expand Up @@ -126,6 +126,7 @@ public String generate(final CamelContext context) throws Exception {
for (String v : VERBS) {
fixParamNodes(xmlMapper, node, v);
fixVerb(node, v);
fixToTags(xmlMapper, node, v);
}
// the root tag should be an array
node = fixRootNode(xmlMapper, node);
Expand Down Expand Up @@ -234,6 +235,28 @@ private static void fixParamNodes(XmlMapper xmlMapper, JsonNode node, String ver
}
}

/**
* to tag should be in implicit mode, ex: to: "direct:directX"
*/
private static void fixToTags(XmlMapper xmlMapper, JsonNode node, String verb) {
JsonNode verbs = node.path("rest").path(verb);
if (verbs == null || verbs.isMissingNode()) {
return;
}
if (!verbs.isArray()) {
// the rest has only 1 verb so fool the code below and wrap in an new array
ArrayNode arr = xmlMapper.createArrayNode();
arr.add(verbs);
verbs = arr;
}
for (JsonNode n : verbs) {
if (n.has("to")) {
ObjectNode on = (ObjectNode) n;
on.set("to", n.get("to").get("uri"));
}
}
}

private static int fieldOrderIndex(String field) {
// to should be last
if ("to".equals(field)) {
Expand Down
3 changes: 1 addition & 2 deletions tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV3PetstoreSimpleYaml.txt
View file
Open in desktop
Expand Up @@ -7,5 +7,4 @@
- name: "body"
required: true
type: "body"
to:
uri: "direct:rest1"
to: "direct:rest1"
60 changes: 20 additions & 40 deletions .../openapi-rest-dsl-generator/src/test/resources/OpenApiV3PetstoreWithRestComponentYaml.txt
View file
Open in desktop
Expand Up @@ -12,8 +12,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:updatePet"
to: "direct:updatePet"
- id: "updateUser"
path: "/user/{username}"
description: "This can only be done by the logged in user."
Expand All @@ -28,8 +27,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:updateUser"
to: "direct:updateUser"
post:
- id: "addPet"
path: "/pet"
Expand All @@ -45,8 +43,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:addPet"
to: "direct:addPet"
- id: "updatePetWithForm"
path: "/pet/{petId}"
consumes: "application/x-www-form-urlencoded"
Expand All @@ -66,8 +63,7 @@
name: "status"
required: true
type: "formData"
to:
uri: "direct:updatePetWithForm"
to: "direct:updatePetWithForm"
- id: "uploadFile"
path: "/pet/{petId}/uploadImage"
consumes: "multipart/form-data"
Expand All @@ -88,8 +84,7 @@
name: "file"
required: true
type: "formData"
to:
uri: "direct:uploadFile"
to: "direct:uploadFile"
- id: "placeOrder"
path: "/store/order"
consumes: "*/*"
Expand All @@ -99,8 +94,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:placeOrder"
to: "direct:placeOrder"
- id: "createUser"
path: "/user"
description: "This can only be done by the logged in user."
Expand All @@ -110,8 +104,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:createUser"
to: "direct:createUser"
- id: "createUsersWithArrayInput"
path: "/user/createWithArray"
consumes: "*/*"
Expand All @@ -120,8 +113,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:createUsersWithArrayInput"
to: "direct:createUsersWithArrayInput"
- id: "createUsersWithListInput"
path: "/user/createWithList"
consumes: "*/*"
Expand All @@ -130,8 +122,7 @@
name: "body"
required: true
type: "body"
to:
uri: "direct:createUsersWithListInput"
to: "direct:createUsersWithListInput"
get:
- id: "findPetsByStatus"
path: "/pet/findByStatus"
Expand All @@ -145,8 +136,7 @@
name: "status"
required: true
type: "query"
to:
uri: "direct:findPetsByStatus"
to: "direct:findPetsByStatus"
- id: "findPetsByTags"
path: "/pet/findByTags"
description: "Muliple tags can be provided with comma separated strings. Use\
Expand All @@ -160,8 +150,7 @@
name: "tags"
required: true
type: "query"
to:
uri: "direct:findPetsByTags"
to: "direct:findPetsByTags"
- id: "getPetById"
path: "/pet/{petId}"
description: "Returns a single pet"
Expand All @@ -172,14 +161,12 @@
name: "petId"
required: true
type: "path"
to:
uri: "direct:getPetById"
to: "direct:getPetById"
- id: "getInventory"
path: "/store/inventory"
description: "Returns a map of status codes to quantities"
produces: "application/json"
to:
uri: "direct:getInventory"
to: "direct:getInventory"
- id: "getOrderById"
path: "/store/order/{orderId}"
description: "For valid response try integer IDs with value >= 1 and <= 10.\
Expand All @@ -191,8 +178,7 @@
name: "orderId"
required: true
type: "path"
to:
uri: "direct:getOrderById"
to: "direct:getOrderById"
- id: "loginUser"
path: "/user/login"
produces: "application/xml,application/json"
Expand All @@ -207,12 +193,10 @@
name: "password"
required: true
type: "query"
to:
uri: "direct:loginUser"
to: "direct:loginUser"
- id: "logoutUser"
path: "/user/logout"
to:
uri: "direct:logoutUser"
to: "direct:logoutUser"
- id: "getUserByName"
path: "/user/{username}"
produces: "application/xml,application/json"
Expand All @@ -222,8 +206,7 @@
name: "username"
required: true
type: "path"
to:
uri: "direct:getUserByName"
to: "direct:getUserByName"
delete:
- id: "deletePet"
path: "/pet/{petId}"
Expand All @@ -237,8 +220,7 @@
name: "petId"
required: true
type: "path"
to:
uri: "direct:deletePet"
to: "direct:deletePet"
- id: "deleteOrder"
path: "/store/order/{orderId}"
description: "For valid response try integer IDs with positive integer value.\
Expand All @@ -249,8 +231,7 @@
name: "orderId"
required: true
type: "path"
to:
uri: "direct:deleteOrder"
to: "direct:deleteOrder"
- id: "deleteUser"
path: "/user/{username}"
description: "This can only be done by the logged in user."
Expand All @@ -260,5 +241,4 @@
name: "username"
required: true
type: "path"
to:
uri: "direct:deleteUser"
to: "direct:deleteUser"