[cwiki] Show enum values for URI parameters (#6174)

* Show enum values for URI parameters * Update petstore
OpenAPITools · May 13, 2020 · a842e1c · a842e1c
1 parent ca436cb
commit a842e1c
Show file tree

Hide file tree

Showing 4 changed files with 657 additions and 767 deletions.
diff --git a/modules/openapi-generator/src/main/resources/confluenceWikiDocs/index.mustache b/modules/openapi-generator/src/main/resources/confluenceWikiDocs/index.mustache
@@ -27,13 +27,13 @@ h3. {{nickname}}
 h4. Parameters
     {{#hasPathParams}}
 h5. Path Parameters
-        ||Name||Description||Required||Default||Pattern||{{#pathParams}}
+        ||Name||Description||Type||Required||Default||Pattern||Enum||{{#pathParams}}
         {{>param}}{{/pathParams}}
     {{/hasPathParams}}
 
     {{#hasBodyParam}}
 h5. Body Parameter
-        ||Name||Description||Required||Default||Pattern||
+        ||Name||Description||Type||Required||Default||Pattern||Enum||
         {{#bodyParams}}{{>param}}{{/bodyParams}}
     {{/hasBodyParam}}
 
@@ -57,7 +57,7 @@ h4. Responses
     	|| Response Type | {{{dataType}}} |
     	|| Response Model | [{{dataType}} Model|#{{dataType}}ModelAnchor|Jump to model] |
     	|| Response Schema | {code:collapse=true}{{{jsonSchema}}}{code}{{#examples}}{code:title=Example {{{contentType}}} |collapse=true }{{{example}}}{code}{{/examples}} |
-    	{{#hasExamples}}{{#examples}}|| Example {{-index}} | {code:title=Example {{{contentType}}} |collapse=true }{{{example}}}{code} |{{/examples}}{{/hasExamples}}
+       {{#hasExamples}}{{#examples}}|| Example {{-index}} | {code:title=Example {{{contentType}}} |collapse=true }{{{example}}}{code} |{{/examples}}{{/hasExamples}}
 
     {{/responses}}
 {panel}
@@ -74,8 +74,11 @@ h2. Models
     {{#model}}
         {anchor:{{classname}}ModelAnchor}
         h3. {{classname}}
-        ||Field Name||Required||Type||Description||
-        {{#vars}} |{{name}} |{{#required}}(/){{/required}}{{^required}}(x){{/required}} |{noformat:nopanel=true}{{{dataType}}}{noformat} |{{description}} |
+
+        {{description}}
+
+        ||Field Name||Required||Type||Description||Enum||
+        {{#vars}} |{{baseName}} |{{#required}}(/){{/required}}{{^required}}(x){{/required}} |{noformat:nopanel=true}{{{dataType}}}{noformat} |{{description}} | {{#isEnum}} {{_enum}} {{/isEnum}} |
         {{/vars}}
     {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/confluenceWikiDocs/param.mustache b/modules/openapi-generator/src/main/resources/confluenceWikiDocs/param.mustache
@@ -1 +1 @@
-|{{paramName}} |{{description}} |{{^required}}(x){{/required}}{{#required}}(/){{/required}} |{{defaultValue}} | {{{pattern}}} |
+|{{baseName}} |{{description}} | {{dataType}} | {{^required}}(x){{/required}}{{#required}}(/){{/required}} |{{defaultValue}} | {{{pattern}}} | {{#isEnum}}{{_enum}}{{/isEnum}} |
diff --git a/samples/documentation/cwiki/.openapi-generator/VERSION b/samples/documentation/cwiki/.openapi-generator/VERSION
@@ -1 +1 @@
-3.3.4-SNAPSHOT
+4.3.1-SNAPSHOT
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		\|{{paramName}} \|{{description}} \|{{^required}}(x){{/required}}{{#required}}(/){{/required}} \|{{defaultValue}} \| {{{pattern}}} \|
		\|{{baseName}} \|{{description}} \| {{dataType}} \| {{^required}}(x){{/required}}{{#required}}(/){{/required}} \|{{defaultValue}} \| {{{pattern}}} \| {{#isEnum}}{{_enum}}{{/isEnum}} \|