Skip to content

Commit b4f370d

Browse files
committed
break everything consistently to make CR easier
1 parent 4c6e186 commit b4f370d

File tree

13 files changed

+370
-142
lines changed

13 files changed

+370
-142
lines changed

modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-tags.yaml

Lines changed: 70 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -654,75 +654,104 @@ paths:
654654
404:
655655
description: User not found
656656
content: { }
657-
/items/{item$Id}:
657+
/items/{item$Id}/something/{item$SubId}:
658658
get:
659-
summary: "Retrieve item \"by\" $Id"
660-
description: "Get an item using the $symbol in \"parameter\" and property names."
659+
summary: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
660+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
661661
parameters:
662662
- name: "item$Id"
663663
in: path
664664
required: true
665-
description: "The $prefixed \"ID\" of the item."
665+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
666666
schema:
667667
type: string
668-
example: "i\"te\"m$123"
668+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
669+
- name: "item$SubId"
670+
in: path
671+
required: true
672+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
673+
schema:
674+
type: string
675+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
669676
- name: "filter$Type"
670677
in: query
671678
required: false
672-
description: "Optional $filter \"for\" item type."
679+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
680+
schema:
681+
type: string
682+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
683+
"default": "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
684+
- name: "filter$SubType"
685+
in: query
686+
required: false
687+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
673688
schema:
674689
type: string
675-
example: "\"type$A\""
676-
"default": "\"type\"$ADefault"
690+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
691+
"default": 'SQ = "; SBS = \; DBS = \\; SD = $some'
677692
- name: "X-Custom_Header"
678693
in: header
679694
required: false
680-
description: "Header \"param\" with $"
695+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
681696
schema:
682697
type: string
683-
example: "hdr$su\"val\""
698+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
699+
- name: "X-Custom_Header_two"
700+
in: header
701+
required: false
702+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
703+
schema:
704+
type: string
705+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
684706
- name: "session$Token"
685707
in: cookie
686708
required: false
687-
description: "Cookie param with $dol\"lar\""
709+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
710+
schema:
711+
type: string
712+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
713+
- name: "session$TokenTwo"
714+
in: cookie
715+
required: false
716+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
688717
schema:
689718
type: string
690-
example: "cookie$a\"bc\""
719+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
691720
responses:
692721
'200':
693-
description: "\"Successful $response\""
722+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
694723
content:
695724
application/json:
696725
schema:
697726
type: object
698727
properties:
699728
item$Id:
700729
type: string
701-
description: "The $ID of \"the\" item."
702-
example: "\"item$123\""
703-
default: "Item$Id\"Default\""
730+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
731+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
732+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
704733
name$Value:
705734
type: string
706-
description: "The $name \"of the \"item."
707-
example: "\"Item\"$Name"
708-
default: "Item$\"NameDefault\""
735+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
736+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
737+
default: 'SQ = "; SBS = \; DBS = \\; SD = $some'
709738
details$Info:
710739
type: object
711-
description: "Nested \"object\" with $keys."
740+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
712741
properties:
713742
detail$One:
714743
type: string
715-
description: "\"First $detail\""
716-
example: "\"Detail$1\""
717-
default: "\"Detail\"$1Default"
744+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
745+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
746+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
718747
detail$Two:
719748
type: integer
720-
description: "\"Second\" $detail"
749+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
721750
example: 42
722751
/items:
723752
post:
724-
summary: "Create $it\"em\""
725-
description: "POST using form params and $every\"where\"."
753+
summary: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
754+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
726755
requestBody:
727756
required: true
728757
content:
@@ -732,24 +761,25 @@ paths:
732761
properties:
733762
form$Name:
734763
type: string
735-
description: "Form field with $issue \"fdsfsd\""
736-
example: "Name$X\"fsdfsd\""
764+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
765+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
737766
form$Value:
738767
type: string
739-
description: "Another $form \"field\""
740-
example: "Val$Y\"fdfsdf\""
768+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
769+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
770+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
741771
parameters:
742772
- name: "X-Post_Header"
743773
in: header
744774
required: false
745-
description: "Header \"param\" with $"
775+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
746776
schema:
747777
type: string
748-
example: "hdr$po\"st\""
778+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
749779

750780
responses:
751781
"201":
752-
description: "$test \"created\""
782+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
753783
content:
754784
application/json:
755785
schema:
@@ -888,18 +918,18 @@ components:
888918
description: Describes the result of uploading an image resource
889919
ItemWithDollarAttributesAndExamples:
890920
type: object
891-
description: "A schema \"demonstrating\" $usage in properties."
921+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
892922
properties:
893923
$id:
894924
type: string
895-
description: "\"$ID property\""
896-
example: "$item\"123\""
897-
default: "$item\"123Default\""
925+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
926+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
927+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
898928
$name:
899929
type: string
900-
description: "$Name\" property\""
901-
example: "$Item\"Name"
902-
default: "$ItemNameDefault\""
930+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
931+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
932+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
903933
securitySchemes:
904934
petstore_auth:
905935
type: oauth2

modules/openapi-generator/src/test/resources/3_0/kotlin/petstore-with-x-kotlin-implements.yaml

Lines changed: 70 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -486,75 +486,104 @@ paths:
486486
description: Invalid username supplied
487487
'404':
488488
description: User not found
489-
/items/{item$Id}:
489+
/items/{item$Id}/something/{item$SubId}:
490490
get:
491-
summary: "Retrieve item \"by\" $Id"
492-
description: "Get an item using the $symbol in \"parameter\" and property names."
491+
summary: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
492+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
493493
parameters:
494494
- name: "item$Id"
495495
in: path
496496
required: true
497-
description: "The $prefixed \"ID\" of the item."
497+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
498498
schema:
499499
type: string
500-
example: "i\"te\"m$123"
500+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
501+
- name: "item$SubId"
502+
in: path
503+
required: true
504+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
505+
schema:
506+
type: string
507+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
501508
- name: "filter$Type"
502509
in: query
503510
required: false
504-
description: "Optional $filter \"for\" item type."
511+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
512+
schema:
513+
type: string
514+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
515+
"default": "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
516+
- name: "filter$SubType"
517+
in: query
518+
required: false
519+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
505520
schema:
506521
type: string
507-
example: "\"type$A\""
508-
"default": "\"type\"$ADefault"
522+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
523+
"default": 'SQ = "; SBS = \; DBS = \\; SD = $some'
509524
- name: "X-Custom_Header"
510525
in: header
511526
required: false
512-
description: "Header \"param\" with $"
527+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
513528
schema:
514529
type: string
515-
example: "hdr$su\"val\""
530+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
531+
- name: "X-Custom_Header_two"
532+
in: header
533+
required: false
534+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
535+
schema:
536+
type: string
537+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
516538
- name: "session$Token"
517539
in: cookie
518540
required: false
519-
description: "Cookie param with $dol\"lar\""
541+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
542+
schema:
543+
type: string
544+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
545+
- name: "session$TokenTwo"
546+
in: cookie
547+
required: false
548+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
520549
schema:
521550
type: string
522-
example: "cookie$a\"bc\""
551+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
523552
responses:
524553
'200':
525-
description: "\"Successful $response\""
554+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
526555
content:
527556
application/json:
528557
schema:
529558
type: object
530559
properties:
531560
item$Id:
532561
type: string
533-
description: "The $ID of \"the\" item."
534-
example: "\"item$123\""
535-
default: "Item$Id\"Default\""
562+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
563+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
564+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
536565
name$Value:
537566
type: string
538-
description: "The $name \"of the \"item."
539-
example: "\"Item\"$Name"
540-
default: "Item$\"NameDefault\""
567+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
568+
example: 'SQ = "; SBS = \; DBS = \\; SD = $some'
569+
default: 'SQ = "; SBS = \; DBS = \\; SD = $some'
541570
details$Info:
542571
type: object
543-
description: "Nested \"object\" with $keys."
572+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
544573
properties:
545574
detail$One:
546575
type: string
547-
description: "\"First $detail\""
548-
example: "\"Detail$1\""
549-
default: "\"Detail\"$1Default"
576+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
577+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
578+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
550579
detail$Two:
551580
type: integer
552-
description: "\"Second\" $detail"
581+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
553582
example: 42
554583
/items:
555584
post:
556-
summary: "Create $it\"em\""
557-
description: "POST using form params and $every\"where\"."
585+
summary: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
586+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
558587
requestBody:
559588
required: true
560589
content:
@@ -564,24 +593,25 @@ paths:
564593
properties:
565594
form$Name:
566595
type: string
567-
description: "Form field with $issue \"fdsfsd\""
568-
example: "Name$X\"fsdfsd\""
596+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
597+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
569598
form$Value:
570599
type: string
571-
description: "Another $form \"field\""
572-
example: "Val$Y\"fdfsdf\""
600+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
601+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
602+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
573603
parameters:
574604
- name: "X-Post_Header"
575605
in: header
576606
required: false
577-
description: "Header \"param\" with $"
607+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
578608
schema:
579609
type: string
580-
example: "hdr$po\"st\""
610+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
581611

582612
responses:
583613
"201":
584-
description: "$test \"created\""
614+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
585615
content:
586616
application/json:
587617
schema:
@@ -745,15 +775,15 @@ components:
745775
type: string
746776
ItemWithDollarAttributesAndExamples:
747777
type: object
748-
description: "A schema \"demonstrating\" $usage in properties."
778+
description: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
749779
properties:
750780
$id:
751781
type: string
752-
description: "\"$ID property\""
753-
example: "$item\"123\""
754-
default: "$item\"123Default\""
782+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
783+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
784+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
755785
$name:
756786
type: string
757-
description: "$Name\" property\""
758-
example: "$Item\"Name"
759-
default: "$ItemNameDefault\""
787+
description: 'SQ = "; SBS = \; DBS = \\; SD = $some'
788+
example: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"
789+
default: "SQ = \"; SBS = \\; DBS = \\\\; SD = $some"

samples/server/petstore/kotlin-springboot-include-http-request-context-delegate/.openapi-generator/FILES

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ src/main/kotlin/org/openapitools/model/Category.kt
2626
src/main/kotlin/org/openapitools/model/Color.kt
2727
src/main/kotlin/org/openapitools/model/Dog.kt
2828
src/main/kotlin/org/openapitools/model/ItemWithDollarAttributesAndExamples.kt
29-
src/main/kotlin/org/openapitools/model/ItemsItemIdGet200Response.kt
30-
src/main/kotlin/org/openapitools/model/ItemsItemIdGet200ResponseDetailsInfo.kt
29+
src/main/kotlin/org/openapitools/model/ItemsItemIdSomethingItemSubIdGet200Response.kt
30+
src/main/kotlin/org/openapitools/model/ItemsItemIdSomethingItemSubIdGet200ResponseDetailsInfo.kt
3131
src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
3232
src/main/kotlin/org/openapitools/model/Order.kt
3333
src/main/kotlin/org/openapitools/model/Pet.kt

0 commit comments

Comments
 (0)